Skip to content

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

AVI: abort on allocation failure

parent 9c14964b
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
modules/demux/avi/libavi.c
View file @ fb4754ad
...@@ -162,7 +162,7 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container ) ...@@ -162,7 +162,7 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container )
msg_Dbg( (vlc_object_t*)s, "<list \'%4.4s\'>", (char*)&p_container->list.i_type ); msg_Dbg( (vlc_object_t*)s, "<list \'%4.4s\'>", (char*)&p_container->list.i_type );
for( ; ; ) for( ; ; )
{ {
p_chk = malloc( sizeof( avi_chunk_t ) ); p_chk = xmalloc( sizeof( avi_chunk_t ) );
memset( p_chk, 0, sizeof( avi_chunk_t ) ); memset( p_chk, 0, sizeof( avi_chunk_t ) );
if( !p_container->common.p_first ) if( !p_container->common.p_first )
{ {
...@@ -335,7 +335,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk ) ...@@ -335,7 +335,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
{ {
case( AVIFOURCC_auds ): case( AVIFOURCC_auds ):
p_chk->strf.auds.i_cat = AUDIO_ES; p_chk->strf.auds.i_cat = AUDIO_ES;
p_chk->strf.auds.p_wf = malloc( __MAX( p_chk->common.i_chunk_size, sizeof( WAVEFORMATEX ) ) ); p_chk->strf.auds.p_wf = xmalloc( __MAX( p_chk->common.i_chunk_size, sizeof( WAVEFORMATEX ) ) );
AVI_READ2BYTES( p_chk->strf.auds.p_wf->wFormatTag ); AVI_READ2BYTES( p_chk->strf.auds.p_wf->wFormatTag );
AVI_READ2BYTES( p_chk->strf.auds.p_wf->nChannels ); AVI_READ2BYTES( p_chk->strf.auds.p_wf->nChannels );
AVI_READ4BYTES( p_chk->strf.auds.p_wf->nSamplesPerSec ); AVI_READ4BYTES( p_chk->strf.auds.p_wf->nSamplesPerSec );
...@@ -384,7 +384,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk ) ...@@ -384,7 +384,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
case( AVIFOURCC_vids ): case( AVIFOURCC_vids ):
p_strh->strh.i_samplesize = 0; /* XXX for ffmpeg avi file */ p_strh->strh.i_samplesize = 0; /* XXX for ffmpeg avi file */
p_chk->strf.vids.i_cat = VIDEO_ES; p_chk->strf.vids.i_cat = VIDEO_ES;
p_chk->strf.vids.p_bih = malloc( __MAX( p_chk->common.i_chunk_size, p_chk->strf.vids.p_bih = xmalloc( __MAX( p_chk->common.i_chunk_size,
sizeof( *p_chk->strf.vids.p_bih ) ) ); sizeof( *p_chk->strf.vids.p_bih ) ) );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biSize ); AVI_READ4BYTES( p_chk->strf.vids.p_bih->biSize );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biWidth ); AVI_READ4BYTES( p_chk->strf.vids.p_bih->biWidth );
...@@ -440,7 +440,7 @@ static void AVI_ChunkFree_strf( avi_chunk_t *p_chk ) ...@@ -440,7 +440,7 @@ static void AVI_ChunkFree_strf( avi_chunk_t *p_chk )
static int AVI_ChunkRead_strd( stream_t *s, avi_chunk_t *p_chk ) static int AVI_ChunkRead_strd( stream_t *s, avi_chunk_t *p_chk )
{ {
AVI_READCHUNK_ENTER; AVI_READCHUNK_ENTER;
p_chk->strd.p_data = malloc( p_chk->common.i_chunk_size ); p_chk->strd.p_data = xmalloc( p_chk->common.i_chunk_size );
memcpy( p_chk->strd.p_data, p_buff + 8, p_chk->common.i_chunk_size ); memcpy( p_chk->strd.p_data, p_buff + 8, p_chk->common.i_chunk_size );
AVI_READCHUNK_EXIT( VLC_SUCCESS ); AVI_READCHUNK_EXIT( VLC_SUCCESS );
} }
...@@ -462,7 +462,7 @@ static int AVI_ChunkRead_idx1( stream_t *s, avi_chunk_t *p_chk ) ...@@ -462,7 +462,7 @@ static int AVI_ChunkRead_idx1( stream_t *s, avi_chunk_t *p_chk )
p_chk->idx1.i_entry_max = i_count; p_chk->idx1.i_entry_max = i_count;
if( i_count > 0 ) if( i_count > 0 )
{ {
p_chk->idx1.entry = calloc( i_count, sizeof( idx1_entry_t ) ); p_chk->idx1.entry = xcalloc( i_count, sizeof( idx1_entry_t ) );
for( i_index = 0; i_index < i_count ; i_index++ ) for( i_index = 0; i_index < i_count ; i_index++ )
{ {
...@@ -516,7 +516,7 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk ) ...@@ -516,7 +516,7 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk )
i_count = __MIN( p_indx->i_entriesinuse, i_read / 8 ); i_count = __MIN( p_indx->i_entriesinuse, i_read / 8 );
p_indx->i_entriesinuse = i_count; p_indx->i_entriesinuse = i_count;
p_indx->idx.std = calloc( i_count, sizeof( indx_std_entry_t ) ); p_indx->idx.std = xcalloc( i_count, sizeof( indx_std_entry_t ) );
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
{ {
...@@ -531,7 +531,7 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk ) ...@@ -531,7 +531,7 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk )
i_count = __MIN( p_indx->i_entriesinuse, i_read / 12 ); i_count = __MIN( p_indx->i_entriesinuse, i_read / 12 );
p_indx->i_entriesinuse = i_count; p_indx->i_entriesinuse = i_count;
p_indx->idx.field = calloc( i_count, sizeof( indx_field_entry_t ) ); p_indx->idx.field = xcalloc( i_count, sizeof( indx_field_entry_t ) );
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
{ {
AVI_READ4BYTES( p_indx->idx.field[i].i_offset ); AVI_READ4BYTES( p_indx->idx.field[i].i_offset );
...@@ -548,7 +548,7 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk ) ...@@ -548,7 +548,7 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk )
i_count = __MIN( p_indx->i_entriesinuse, i_read / 16 ); i_count = __MIN( p_indx->i_entriesinuse, i_read / 16 );
p_indx->i_entriesinuse = i_count; p_indx->i_entriesinuse = i_count;
p_indx->idx.super = calloc( i_count, sizeof( indx_super_entry_t ) ); p_indx->idx.super = xcalloc( i_count, sizeof( indx_super_entry_t ) );
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
{ {
...@@ -627,7 +627,7 @@ static int AVI_ChunkRead_strz( stream_t *s, avi_chunk_t *p_chk ) ...@@ -627,7 +627,7 @@ static int AVI_ChunkRead_strz( stream_t *s, avi_chunk_t *p_chk )
} }
} }
p_strz->p_type = strdup( AVI_strz_type[i_index].psz_type ); p_strz->p_type = strdup( AVI_strz_type[i_index].psz_type );
p_strz->p_str = malloc( p_strz->i_chunk_size + 1); p_strz->p_str = xmalloc( p_strz->i_chunk_size + 1);
if( p_strz->i_chunk_size ) if( p_strz->i_chunk_size )
{ {
...@@ -862,7 +862,7 @@ int AVI_ChunkReadRoot( stream_t *s, avi_chunk_t *p_root ) ...@@ -862,7 +862,7 @@ int AVI_ChunkReadRoot( stream_t *s, avi_chunk_t *p_root )
for( ; ; ) for( ; ; )
{ {
p_chk = malloc( sizeof( avi_chunk_t ) ); p_chk = xmalloc( sizeof( avi_chunk_t ) );
memset( p_chk, 0, sizeof( avi_chunk_t ) ); memset( p_chk, 0, sizeof( avi_chunk_t ) );
if( !p_root->common.p_first ) if( !p_root->common.p_first )
{ {
......
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