summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-08-12 22:55:59 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-10-23 01:44:40 +0200
commitf1425b389a3b7d4758d2b1faf97f2624e27c3819 (patch)
tree166414a8863954daa1ebef971c2b9d95ca8a299a
parent5eeaaa29fae0d5c22e2e542bc3064b984e34c93b (diff)
downloadffmpeg-f1425b389a3b7d4758d2b1faf97f2624e27c3819.tar.gz
avcodec/shorten: Fix integer overflow in residual/LPC combination
Fixes: signed integer overflow: -540538872 + -2012739576 cannot be represented in type 'int' Fixes: 9255/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5758630052757504 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 db7e9082e1a1479c6a8844f7adf77eae03cc2aa7) 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 047fb05a9b..de2be90e77 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -315,7 +315,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel,
for (j = 0; j < pred_order; j++)
sum += coeffs[j] * (unsigned)s->decoded[channel][i - j - 1];
s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) +
- (sum >> qshift);
+ (unsigned)(sum >> qshift);
}
/* add offset to current samples */