Commit 7e063c47 authored by Rémi Duraffort's avatar Rémi Duraffort

Check asprintf return value and avoid potential segfault.

parent 9d65e771
...@@ -503,13 +503,19 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) ...@@ -503,13 +503,19 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
p_cfg->psz_name ); p_cfg->psz_name );
if( p_cfg->psz_output ) if( p_cfg->psz_output )
asprintf( &psz_output, "%s:description", p_cfg->psz_output ); {
if( asprintf( &psz_output, "%s:description", p_cfg->psz_output ) == -1 )
psz_output = NULL;
}
else else
asprintf( &psz_output, "#description" ); psz_output = strdup( "#description" );
asprintf( &psz_dup, "sout=%s", psz_output); if( psz_output && asprintf( &psz_dup, "sout=%s", psz_output) != -1 )
input_ItemAddOption( p_media->vod.p_item, psz_dup ); {
free( psz_dup ); input_ItemAddOption( p_media->vod.p_item, psz_dup );
free( psz_output );
free( psz_dup );
}
for( i = 0; i < p_cfg->i_option; i++ ) for( i = 0; i < p_cfg->i_option; i++ )
input_ItemAddOption( p_media->vod.p_item, input_ItemAddOption( p_media->vod.p_item,
p_cfg->ppsz_option[i] ); p_cfg->ppsz_option[i] );
...@@ -524,7 +530,6 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) ...@@ -524,7 +530,6 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
input_StopThread( p_input ); input_StopThread( p_input );
vlc_object_release( p_input ); vlc_object_release( p_input );
} }
free( psz_output );
free( psz_header ); free( psz_header );
if( p_cfg->vod.psz_mux ) if( p_cfg->vod.psz_mux )
......
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