avcodec/wavpack: Check shift
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Mar 2017 01:05:23 +0000 (02:05 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Mar 2017 19:54:27 +0000 (20:54 +0100)
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>
libavcodec/wavpack.c

index 3d0b01f257c95b58948913924e741b1ea82b6335..2bda3599a8448e05e6c733bf69d7192f1eaa1a4f 100644 (file)
@@ -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) {