Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-01 19:48:37 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-06 04:44:35 +0300
commit3dc62e679ab2ed88b7fe4a5e691dba3874d62a22 (patch)
treee2480824972712375d49e6a21e2b8afbd6955289
parent4f02447d45681bf7e99f184bc97ee8d68284ffc5 (diff)
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 83e5c906cf..ba5fa7a266 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -188,7 +188,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));
}