Commit 2cc99c5c authored by Rémi Duraffort's avatar Rémi Duraffort

Avoid a potential segfault as vlc_object_create can fail.

parent 83fb3351
...@@ -61,13 +61,13 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent ) ...@@ -61,13 +61,13 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
// 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 ) );
p_playlist->p_preparse->psz_object_name = strdup( "preparser" );
if( !p_playlist->p_preparse ) if( !p_playlist->p_preparse )
{ {
msg_Err( p_playlist, "unable to create preparser" ); msg_Err( p_playlist, "unable to create preparser" );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return; return;
} }
p_playlist->p_preparse->psz_object_name = strdup( "preparser" );
p_playlist->p_preparse->i_waiting = 0; p_playlist->p_preparse->i_waiting = 0;
p_playlist->p_preparse->pp_waiting = NULL; p_playlist->p_preparse->pp_waiting = NULL;
...@@ -85,13 +85,13 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent ) ...@@ -85,13 +85,13 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
// Secondary Preparse // Secondary Preparse
p_playlist->p_fetcher = vlc_object_create( p_playlist, p_playlist->p_fetcher = vlc_object_create( p_playlist,
sizeof( playlist_fetcher_t ) ); sizeof( playlist_fetcher_t ) );
p_playlist->p_fetcher->psz_object_name = strdup( "fetcher" );
if( !p_playlist->p_fetcher ) if( !p_playlist->p_fetcher )
{ {
msg_Err( p_playlist, "unable to create secondary preparser" ); msg_Err( p_playlist, "unable to create secondary preparser" );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return; return;
} }
p_playlist->p_fetcher->psz_object_name = strdup( "fetcher" );
p_playlist->p_fetcher->i_waiting = 0; p_playlist->p_fetcher->i_waiting = 0;
p_playlist->p_fetcher->pp_waiting = NULL; p_playlist->p_fetcher->pp_waiting = NULL;
p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist, p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
......
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