Commit 1703d842 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Check after calloc to avoid null dereference.

Should Close #1499
parent 18eb4fd5
...@@ -1244,6 +1244,14 @@ static int ReadCodecSpecificData( demux_t *p_demux, int i_len, int i_num ) ...@@ -1244,6 +1244,14 @@ static int ReadCodecSpecificData( demux_t *p_demux, int i_len, int i_num )
calloc( tk->i_subpackets, sizeof(block_t *) ); calloc( tk->i_subpackets, sizeof(block_t *) );
} }
/* Check if the calloc went correctly */
if( tk->p_subpackets == NULL )
{
tk->i_subpackets = 0;
msg_Err( p_demux, "Can't alloc subpacket" );
return VLC_EGENERIC;
}
tk->p_es = es_out_Add( p_demux->out, &fmt ); tk->p_es = es_out_Add( p_demux->out, &fmt );
TAB_APPEND( p_sys->i_track, p_sys->track, tk ); TAB_APPEND( p_sys->i_track, p_sys->track, tk );
......
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