Skip to content

V
vlc
Commit cd87a5a9 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: livavi: fix heap buffer ofw in strf parsing (fix #12359)

parent 3979f15f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/demux/avi/libavi.c
View file @ cd87a5a9
...@@ -471,12 +471,12 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk ) ...@@ -471,12 +471,12 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
if ( !p_chk->strf.vids.p_bih->biClrUsed ) if ( !p_chk->strf.vids.p_bih->biClrUsed )
p_chk->strf.vids.p_bih->biClrUsed = (1 << p_chk->strf.vids.p_bih->biBitCount); p_chk->strf.vids.p_bih->biClrUsed = (1 << p_chk->strf.vids.p_bih->biBitCount);
if( i_extrasize > (UINT32_MAX * sizeof(uint32_t)) ) if( i_extrasize / sizeof(uint32_t) > UINT32_MAX )
p_chk->strf.vids.p_bih->biClrUsed = UINT32_MAX; p_chk->strf.vids.p_bih->biClrUsed = UINT32_MAX;
else else
{ {
p_chk->strf.vids.p_bih->biClrUsed = p_chk->strf.vids.p_bih->biClrUsed =
__MAX( i_extrasize / sizeof(uint32_t), __MIN( i_extrasize / sizeof(uint32_t),
p_chk->strf.vids.p_bih->biClrUsed ); p_chk->strf.vids.p_bih->biClrUsed );
} }
......
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