Skip to content

V
vlc-1.1
Commit d3ab3afe authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix NULL deref (CID#237)

parent 6094cb67
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 17 deletions
modules/control/http/macro.c
View file @ d3ab3afe
...@@ -338,25 +338,17 @@ static void MacroDo( httpd_file_sys_t *p_args, ...@@ -338,25 +338,17 @@ static void MacroDo( httpd_file_sys_t *p_args,
p_input = MRLParse( p_intf, mrl, psz_name ); p_input = MRLParse( p_intf, mrl, psz_name );
char *psz_uri = input_item_GetURI( p_input ); char *psz_uri = p_input ? input_item_GetURI( p_input ) : NULL;
if( !p_input || !psz_uri || !*psz_uri ) if( psz_uri && *psz_uri &&
{ playlist_AddInput( p_sys->p_playlist, p_input,
msg_Dbg( p_intf, "invalid requested mrl: %s", mrl ); PLAYLIST_APPEND, PLAYLIST_END,
} true, false) == VLC_SUCCESS )
else
{
int i_ret = playlist_AddInput( p_sys->p_playlist,
p_input,
PLAYLIST_APPEND, PLAYLIST_END, true,
false);
vlc_gc_decref( p_input );
if( i_ret == VLC_SUCCESS )
msg_Dbg( p_intf, "requested mrl add: %s", mrl ); msg_Dbg( p_intf, "requested mrl add: %s", mrl );
else else
msg_Warn( p_intf, "adding mrl %s failed", mrl ); msg_Warn( p_intf, "adding mrl failed: %s", mrl );
}
free( psz_uri ); free( psz_uri );
if( p_input )
vlc_gc_decref( p_input );
break; break;
} }
case MVLC_DEL: case MVLC_DEL:
......
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