aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-06-05 13:12:54 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-06-07 19:52:57 +0200
commita711efe922b2bf1d363bdf7f8357656c3e35021e (patch)
tree3c57870d1902e08353e38eea6a4d9b97bdef9b86
parentd91a0b503d7a886587281bc1ee42476aa5e89f85 (diff)
downloadffmpeg-a711efe922b2bf1d363bdf7f8357656c3e35021e.tar.gz
avcodec/shorten: Fix a negative left shift in shorten_decode_frame()
Fixes: left shift of negative value -9057 Fixes: 8527/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5666853924896768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/shorten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 8aeacfeb31..f7475b4954 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -710,7 +710,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
if (s->version < 2)
s->offset[channel][s->nmean - 1] = sum / s->blocksize;
else
- s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) << s->bitshift;
+ s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) * (1 << s->bitshift);
}
/* copy wrap samples for use with next block */