]> git.sesse.net Git - vlc/commitdiff
libvlc_media_list_player_release: do not leak memory
authorJean-Paul Saman <jpsaman@videolan.org>
Sat, 9 May 2009 19:41:16 +0000 (21:41 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Tue, 12 May 2009 11:51:31 +0000 (13:51 +0200)
src/control/media_list_player.c

index 0f704bd26998f44a08345abecb84aeffccc056b1..4c80ae41ef7662251967be40b854e071785b2891 100644 (file)
@@ -282,7 +282,31 @@ libvlc_media_list_player_new( libvlc_instance_t * p_instance,
  **************************************************************************/
 void libvlc_media_list_player_release( libvlc_media_list_player_t * p_mlp )
 {
-    free(p_mlp);
+    if( !p_mlp )
+        return;
+
+    vlc_mutex_lock( &p_mlp->object_lock );
+
+    p_mlp->i_refcount--;
+    if( p_mlp->i_refcount > 0 )
+    {
+        vlc_mutex_unlock( &p_mlp->object_lock );
+        return;
+    }
+    vlc_mutex_unlock( &p_mlp->object_lock );
+    vlc_mutex_destroy( &p_mlp->object_lock );
+
+    libvlc_event_manager_release( p_mlp->p_event_manager );
+    libvlc_media_player_release( p_mlp->p_mi );
+
+    if( p_mlp->p_mlist )
+    {
+        uninstall_playlist_observer( p_mlp );
+        libvlc_media_list_release( p_mlp->p_mlist );
+    }
+
+    free( p_mlp->current_playing_item_path );
+    free( p_mlp );
 }
 
 /**************************************************************************