highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/wavpack: Check float_shift

Browse Source 
Fixes: runtime error: shift exponent 40 is too large for 32-bit type 'unsigned int'
Fixes: 1898/clusterfuzz-testcase-minimized-5970744880136192

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4020b009d1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-05-30 03:13:21 +02:00
parent 9a92478556
commit 3a56bbe001
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/wavpack.c
View File

@@ -870,6 +870,12 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s->float_flag = bytestream2_get_byte(&gb); s->float_flag = bytestream2_get_byte(&gb);
s->float_shift = bytestream2_get_byte(&gb); s->float_shift = bytestream2_get_byte(&gb);
s->float_max_exp = bytestream2_get_byte(&gb); s->float_max_exp = bytestream2_get_byte(&gb);
if (s->float_shift > 31) {
av_log(avctx, AV_LOG_ERROR,
"Invalid FLOATINFO, shift = %d (> 31)\n", s->float_shift);
s->float_shift = 0;
continue;
}
got_float = 1; got_float = 1;
bytestream2_skip(&gb, 1); bytestream2_skip(&gb, 1);
break; break;