playlist: Never delete the playlist_item directly. We don't know who might need it.

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 4a1e37e3544c2263c3ce82b46a1dd3cab48ed1a8..94470f6ad40df2b16430c8f5d7bc2beaf4216561 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -85,6 +85,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
 
     ARRAY_INIT( p_playlist->items );
     ARRAY_INIT( p_playlist->all_items );
+    ARRAY_INIT( p_playlist->items_to_delete );
     ARRAY_INIT( p_playlist->current );
 
     p_playlist->i_current_index = 0;
@@ -305,9 +306,8 @@ void set_current_status_item( playlist_t * p_playlist,
         p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG &&
         p_playlist->status.p_item != p_item )
     {
-         PL_DEBUG( "%s was marked for deletion, deleting",
-                         PLI_NAME( p_playlist->status.p_item  ) );
-         playlist_ItemDelete( p_playlist->status.p_item );
+        /* It's unsafe given current design to delete a playlist item :(
+        playlist_ItemDelete( p_playlist->status.p_item ); */
     }
     p_playlist->status.p_item = p_item;
 }
@@ -321,9 +321,8 @@ void set_current_status_node( playlist_t * p_playlist,
         p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG &&
         p_playlist->status.p_node != p_node )
     {
-         PL_DEBUG( "%s was marked for deletion, deleting",
-                         PLI_NAME( p_playlist->status.p_node  ) );
-         playlist_ItemDelete( p_playlist->status.p_node );
+        /* It's unsafe given current design to delete a playlist item :(
+        playlist_ItemDelete( p_playlist->status.p_node ); */
     }
     p_playlist->status.p_node = p_node;
 }
@@ -542,6 +541,12 @@ void playlist_LastLoop( playlist_t *p_playlist )
         free( p_del );
     FOREACH_END();
     ARRAY_RESET( p_playlist->all_items );
+    FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->items_to_delete )
+        free( p_del->pp_children );
+        vlc_gc_decref( p_del->p_input );
+        free( p_del );
+    FOREACH_END();
+    ARRAY_RESET( p_playlist->items_to_delete );
 
     ARRAY_RESET( p_playlist->items );
     ARRAY_RESET( p_playlist->current );