summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-12-18 17:55:09 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2023-02-21 23:43:56 +0100
commit194a9429b2543609364a26af72e6d3f1d7bc1934 (patch)
tree2fed37a3269dd1ce96e7690fd74f447320fffa55
parent7d2360f8d67f386f0a89471f0e1857857464a797 (diff)
downloadffmpeg-194a9429b2543609364a26af72e6d3f1d7bc1934.tar.gz
avcodec/wavpack: Avoid undefined shift in get_tail()
Fixes: left shift of 1208485947 by 1 places cannot be represented in type 'int' Fixes: 54058/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5827521084260352 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 8374a747af247d45eb466fcb4aee90f3ae798aad) 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 45c49518f2..32eb2d46bf 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -129,7 +129,7 @@ static av_always_inline unsigned get_tail(GetBitContext *gb, int k)
e = (1 << (p + 1)) - k - 1;
res = get_bitsz(gb, p);
if (res >= e)
- res = (res << 1) - e + get_bits1(gb);
+ res = res * 2U - e + get_bits1(gb);
return res;
}