Commit c338db8d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

playlist: To avoid race on p_input destruction, keep a reference around while...

playlist: To avoid race on p_input destruction, keep a reference around while we need it in playlist_MLLoad().
parent f88f1a76
......@@ -143,6 +143,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
const char *const psz_option = "meta-file";
/* that option has to be cleaned in input_item_subitem_added() */
/* vlc_gc_decref() in the same function */
p_input = input_ItemNewExt( p_playlist, psz_uri,
_("Media Library"), 1, &psz_option, -1 );
if( p_input == NULL )
......@@ -156,6 +157,8 @@ int playlist_MLLoad( playlist_t *p_playlist )
p_playlist->p_ml_onelevel->p_input =
p_playlist->p_ml_category->p_input = p_input;
/* We save the input at two different place, incref */
vlc_gc_incref( p_input );
vlc_gc_incref( p_input );
PL_UNLOCK;
......@@ -177,6 +180,8 @@ int playlist_MLLoad( playlist_t *p_playlist )
vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
input_item_subitem_added, p_playlist );
vlc_gc_decref( p_input );
free( psz_uri );
return VLC_SUCCESS;
......
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