summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-12-18 17:55:09 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2023-04-15 22:38:01 +0200
commit9667007462002d5bcc86e2ce59072770c8a6bbde (patch)
tree791f9d2fa3d26d3dbbfc03d5a5d983efa307f638
parent0e5ce7ac7e2063a3aa3a45121e694a2cd88d5a08 (diff)
downloadffmpeg-9667007462002d5bcc86e2ce59072770c8a6bbde.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 85480be573..a04b606e81 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -128,7 +128,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;
}