aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-17 19:18:31 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-06 20:30:57 +0100
commit1da3f1084eb684cef4587a1cb521ca84ca55902c (patch)
treeef996e3bb6a4ef0359561fc2d1799a46b310b6df /libavcodec
parentb74d119ee67dc4aafaa4b1e62d4395b68aadb43b (diff)
downloadffmpeg-1da3f1084eb684cef4587a1cb521ca84ca55902c.tar.gz
avcodec/ralf: fix undefined shift
Fixes: left shift of negative value -2 Fixes: 16145/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RALF_fuzzer-5146671058518016 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 0ee886988e75b3c22cabc2ca0fadcf8e4f787640) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ralf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index b5cce61004..984a6dc799 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -300,8 +300,8 @@ static int decode_channel(RALFContext *ctx, GetBitContext *gb, int ch,
t = get_vlc2(gb, code_vlc->table, code_vlc->bits, 2);
code1 = t / range2;
code2 = t % range2;
- dst[i] = extend_code(gb, code1, range, 0) << add_bits;
- dst[i + 1] = extend_code(gb, code2, range, 0) << add_bits;
+ dst[i] = extend_code(gb, code1, range, 0) * (1 << add_bits);
+ dst[i + 1] = extend_code(gb, code2, range, 0) * (1 << add_bits);
if (add_bits) {
dst[i] |= get_bits(gb, add_bits);
dst[i + 1] |= get_bits(gb, add_bits);