diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-20 02:05:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-21 20:54:27 +0100 |
| commit | 423375d4f06ae7103e575a31c23e62e3ba440845 (patch) | |
| tree | 489cadd3e08adb0724872193d45962871eb5a6bc | |
| parent | b15818642b4e8c4ea61bf93bc6920e71a834a535 (diff) | |
| download | ffmpeg-423375d4f06ae7103e575a31c23e62e3ba440845.tar.gz | |
avcodec/wavpack: Check shift
Fixes: runtime error: shift exponent 255 is too large for 32-bit type 'unsigned int'
Fixes: 894/clusterfuzz-testcase-4841537823309824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/wavpack.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 3d0b01f257..2bda3599a8 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -861,6 +861,12 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, s->and = 1; s->shift = val[3]; } + if (s->shift > 31) { + av_log(avctx, AV_LOG_ERROR, + "Invalid INT32INFO, shift = %d (> 31)\n", s->shift); + s->and = s->or = s->shift = 0; + continue; + } /* original WavPack decoder forces 32-bit lossy sound to be treated * as 24-bit one in order to have proper clipping */ if (s->hybrid && bpp == 4 && s->post_shift < 8 && s->shift > 8) { |