From 9bfae838563b9cf7ced9053265cfdb4405bce7eb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 11 Sep 2022 12:00:31 +0200 Subject: [PATCH] avcodec/wavpack: Fix overflow in p=31 Untested with "non fuzzed" samples as i have no such file The reference 5.6.0 decoder appears to also have undefined behavior in the lossless codepath for this Fixes: shift exponent 32 is too large for 32-bit type 'int' Fixes: 50930/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-6319201949712384 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index ea77ae7749..3cb4077550 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -126,7 +126,7 @@ static av_always_inline unsigned get_tail(GetBitContext *gb, unsigned k) if (k < 1) return 0; p = av_log2(k); - e = (1 << (p + 1)) - k - 1; + e = (1LL << (p + 1)) - k - 1; res = get_bits_long(gb, p); if (res >= e) res = (res << 1) - e + get_bits1(gb);