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-07 23:40:39 +0200
commitfdff97fe4766d3e29bb9a6fae6d681c28d5cda7a (patch)
tree09a7574949b420eba0340e5b397c9c6daa0ecf5d
parent79afac279bb40b9d47c12a71c406a8c78c52b656 (diff)
downloadffmpeg-fdff97fe4766d3e29bb9a6fae6d681c28d5cda7a.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 f8d861ea98..4b865087bb 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;
}