X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fservices_discovery.c;h=76ce11dc5588f04348ad503b4131bcf23338289a;hb=8b524cb8b23f4acfb96c6a07b404c73615e5e6c2;hp=17bf55102b137ef3d627ce1d51e331ad6114e2d0;hpb=a518149f3478fc8bc984b114a1821d0fd83cecab;p=vlc

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 17bf55102b..76ce11dc55 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -123,9 +123,21 @@ int services_discovery_Start ( services_discovery_t * p_sd )
 /***********************************************************************
  * Stop
  ***********************************************************************/
+static void ObjectKillChildrens( vlc_object_t *p_obj )
+{
+    vlc_list_t *p_list;
+    int i;
+    vlc_object_kill( p_obj );
+
+    p_list = vlc_list_children( p_obj );
+    for( i = 0; i < p_list->i_count; i++ )
+        ObjectKillChildrens( p_list->p_values[i].p_object );
+    vlc_list_release( p_list );
+}
+
 void services_discovery_Stop ( services_discovery_t * p_sd )
 {
-    vlc_object_kill( p_sd );
+    ObjectKillChildrens( VLC_OBJECT(p_sd) );
     if( p_sd->pf_run ) vlc_thread_join( p_sd );
 
     module_Unneed( p_sd, p_sd->p_module );
@@ -411,6 +423,7 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
     PL_UNLOCK;
 
     services_discovery_Destroy( p_sds->p_sd );
+    free( p_sds );
 
     return VLC_SUCCESS;
 }