aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-01 18:48:37 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-04 01:10:21 +0200
commit2c3bcf6bf2381f214d834bf71eb5b79caac08e7d (patch)
tree2c6466b753d25318eee506845690810b0996a4dc
parentecc3fe3859f3f924eb9f841fd0cc5c42d9636a8b (diff)
downloadffmpeg-2c3bcf6bf2381f214d834bf71eb5b79caac08e7d.tar.gz
avcodec/wavpack: Fix runtime error: shift exponent 32 is too large for 32-bit type 'int'
Fixes: 1967/clusterfuzz-testcase-minimized-5757031199801344 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 8b3e580b7f436206e84dac89415e057fa9abdab8) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/wavpack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 9ce074d975..e55cd82595 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -184,7 +184,7 @@ static int wv_get_value(WavpackFrameContext *ctx, GetBitContext *gb,
goto error;
t += t2;
} else {
- if (get_bits_left(gb) < t2 - 1)
+ if (t2 >= 32 || get_bits_left(gb) < t2 - 1)
goto error;
t += get_bits_long(gb, t2 - 1) | (1 << (t2 - 1));
}