LibVLC log: remove exceptions

[vlc] / src / control / media_discoverer.c

diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c
index 5fbfc747e88fb0c1afec3bbac0e15fc881e5b415..23e06c3beb4bbfde5c22fa8f9b3bbf882b2030ca 100644 (file)
--- a/src/control/media_discoverer.c
+++ b/src/control/media_discoverer.c
@@ -184,19 +184,23 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
     }
 
     p_mdis->p_libvlc_instance = p_inst;
-    p_mdis->p_mlist = libvlc_media_list_new( p_inst, NULL );
+    p_mdis->p_mlist = libvlc_media_list_new( p_inst );
     p_mdis->p_mlist->b_read_only = true;
     p_mdis->running = false;
 
     vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 );
 
-    p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis,
-            p_inst, NULL );
+    p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis, p_inst );
+    if( unlikely(p_mdis->p_event_manager == NULL) )
+    {
+        free( p_mdis );
+        return NULL;
+    }
 
     libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
-            libvlc_MediaDiscovererStarted, NULL );
+            libvlc_MediaDiscovererStarted );
     libvlc_event_manager_register_event_type( p_mdis->p_event_manager,
-            libvlc_MediaDiscovererEnded, NULL );
+            libvlc_MediaDiscovererEnded );
 
     p_mdis->p_sd = vlc_sd_Create( (vlc_object_t*)p_inst->p_libvlc_int );