Commit 28a41153 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

src/playlist: Fix a rare memleak that could happen when the interaction is...

src/playlist: Fix a rare memleak that could happen when the interaction is created earlier than expected. (Fix vlc_object mem leak that happen when no module is loaded).
parent 55b36288
...@@ -150,6 +150,12 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) ...@@ -150,6 +150,12 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
p_playlist->i_sort = SORT_ID; p_playlist->i_sort = SORT_ID;
p_playlist->i_order = ORDER_NORMAL; p_playlist->i_order = ORDER_NORMAL;
/* Interaction
* Init the interaction here, as playlist_MLLoad could trigger
* interaction init */
p_playlist->p_interaction = NULL;
b_save = p_playlist->b_auto_preparse; b_save = p_playlist->b_auto_preparse;
p_playlist->b_auto_preparse = VLC_FALSE; p_playlist->b_auto_preparse = VLC_FALSE;
playlist_MLLoad( p_playlist ); playlist_MLLoad( p_playlist );
......
...@@ -65,9 +65,6 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent ) ...@@ -65,9 +65,6 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
vlc_mutex_init( p_playlist, &p_playlist->p_stats->lock ); vlc_mutex_init( p_playlist, &p_playlist->p_stats->lock );
p_playlist->p_stats_computer = NULL; p_playlist->p_stats_computer = NULL;
// Interaction
p_playlist->p_interaction = NULL;
// Preparse // Preparse
p_playlist->p_preparse = vlc_object_create( p_playlist, p_playlist->p_preparse = vlc_object_create( p_playlist,
sizeof( playlist_preparse_t ) ); sizeof( playlist_preparse_t ) );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment