Skip to content

V
vlc-2-2
Commit 6c0587c2 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: avi: add E_NOMEM returns

parent 9bf77558
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
modules/demux/avi/libavi.c
View file @ 6c0587c2
...@@ -338,6 +338,10 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk ) ...@@ -338,6 +338,10 @@ 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 = xmalloc( __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 ) ) );
if ( !p_chk->strf.auds.p_wf )
{
AVI_READCHUNK_EXIT( VLC_ENOMEM );
}
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 );
...@@ -388,6 +392,10 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk ) ...@@ -388,6 +392,10 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
p_chk->strf.vids.i_cat = VIDEO_ES; p_chk->strf.vids.i_cat = VIDEO_ES;
p_chk->strf.vids.p_bih = xmalloc( __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 ) ) );
if ( !p_chk->strf.vids.p_bih )
{
AVI_READCHUNK_EXIT( VLC_ENOMEM );
}
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 );
AVI_READ4BYTES( p_chk->strf.vids.p_bih->biHeight ); AVI_READ4BYTES( p_chk->strf.vids.p_bih->biHeight );
......
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