macosx: Fix a memleak.

[vlc] / src / control / media_discoverer.c

diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c
index 0cce5c98344414d5f7c290428e8db0fcd54c18a1..5f33b145f9d4c147dbd54a3e002a449d95a7f35b 100644 (file)
--- a/src/control/media_discoverer.c
+++ b/src/control/media_discoverer.c
@@ -51,7 +51,6 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
      * that category in a media_list. */
     if( psz_cat )
     {
-        p_mlist = kVLCDictionaryNotFound;
         p_mlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, psz_cat );
 
         if( p_mlist == kVLCDictionaryNotFound )
@@ -62,8 +61,8 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
             p_mlist->b_read_only = true;
 
             /* Insert the newly created mlist in our dictionary */
-            __vlc_dictionary_insert( &p_mdis->catname_to_submedialist, psz_cat, p_mlist, 0 );
-            
+            vlc_dictionary_insert( &p_mdis->catname_to_submedialist, psz_cat, p_mlist );
+
             /* Insert the md into the root list */
             libvlc_media_list_lock( p_mdis->p_mlist );
             _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd, NULL );
@@ -74,10 +73,12 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
             libvlc_media_release( p_catmd );
         }
     }
-
-    libvlc_media_list_lock( p_mlist );
-    _libvlc_media_list_add_media( p_mlist, p_md, NULL );
-    libvlc_media_list_unlock( p_mlist );
+    else
+    {
+        libvlc_media_list_lock( p_mlist );
+        _libvlc_media_list_add_media( p_mlist, p_md, NULL );
+        libvlc_media_list_unlock( p_mlist );
+    }
 }
 
 /**************************************************************************
@@ -112,7 +113,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
 static void services_discovery_started( const vlc_event_t * p_event,
                                         void * user_data )
 {
-    (void)p_event;
+    VLC_UNUSED(p_event);
     libvlc_media_discoverer_t * p_mdis = user_data;
     libvlc_event_t event;
     p_mdis->running = true;
@@ -127,7 +128,7 @@ static void services_discovery_started( const vlc_event_t * p_event,
 static void services_discovery_ended( const vlc_event_t * p_event,
                                       void * user_data )
 {
-    (void)p_event;
+    VLC_UNUSED(p_event);
     libvlc_media_discoverer_t * p_mdis = user_data;
     libvlc_event_t event;
     p_mdis->running = false;
@@ -150,7 +151,7 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
                                        libvlc_exception_t * p_e )
 {
     libvlc_media_discoverer_t * p_mdis;
- 
+
     p_mdis = malloc(sizeof(libvlc_media_discoverer_t));
     if( !p_mdis )
     {
@@ -269,4 +270,3 @@ libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis )
 {
     return p_mdis->running;
 }
-