generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/utvideodec: Fix undefined behavior in shift

Browse Source 
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-11 03:34:58 +01:00
parent 35dcc8a040
commit 48efe9ec86
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utvideodec.c
View File

@ -56,13 +56,14 @@ static int build_huff(const uint8_t *src, VLC *vlc, int *fsym)
*fsym = he[0].sym; *fsym = he[0].sym;
return 0; return 0;
} }
if (he[0].len > 32)
return -1;
last = 255; last = 255;
while (he[last].len == 255 && last) while (he[last].len == 255 && last)
last--; last--;
if (he[last].len > 32)
return -1;
code = 1; code = 1;
for (i = last; i >= 0; i--) { for (i = last; i >= 0; i--) {
codes[i] = code >> (32 - he[i].len); codes[i] = code >> (32 - he[i].len);