Skip to content

V
vlc-2-2
Commit 8c9e80fb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

lib: avoid NULL deref on error

parent 3fa1290c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
lib/media.c
View file @ 8c9e80fb
...@@ -113,15 +113,14 @@ static void input_item_subitem_added( const vlc_event_t *p_event, ...@@ -113,15 +113,14 @@ static void input_item_subitem_added( const vlc_event_t *p_event,
p_event->u.input_item_subitem_added.p_new_child ); p_event->u.input_item_subitem_added.p_new_child );
/* Add this to our media list */ /* Add this to our media list */
if( !p_md->p_subitems ) if( p_md->p_subitems == NULL )
{ {
p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance ); p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
if( unlikely(p_md->p_subitems == NULL) )
abort();
libvlc_media_list_set_media( p_md->p_subitems, p_md ); libvlc_media_list_set_media( p_md->p_subitems, p_md );
} }
if( p_md->p_subitems ) libvlc_media_list_add_media( p_md->p_subitems, p_md_child );
{
libvlc_media_list_add_media( p_md->p_subitems, p_md_child );
}
/* Construct the event */ /* Construct the event */
event.type = libvlc_MediaSubItemAdded; event.type = libvlc_MediaSubItemAdded;
......
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