diff options
| author | Michael Niedermayer <[email protected]> | 2018-06-05 13:19:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2018-10-23 01:44:40 +0200 |
| commit | 50e55b81be23bed6a5aa836fdde602494b41c06c (patch) | |
| tree | eef2a0a5e5c16e0f7c74c80ef1c9b9a34ebf5ed1 | |
| parent | 07fd8627e5c274064aed85f0db73e9128a8e8cab (diff) | |
avcodec/shorten: Fix multiple integer overflows
Fixes: signed integer overflow: 3 * 1006632960 cannot be represented in type 'int'
Fixes: 8278/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5692857166856192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit f2abd36b3863188894fd21964c662b6c17268bfb)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/shorten.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index b8a5664ce9..cbd8a78bc4 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -313,7 +313,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel, for (i = 0; i < s->blocksize; i++) { sum = init_sum; for (j = 0; j < pred_order; j++) - sum += coeffs[j] * s->decoded[channel][i - j - 1]; + sum += coeffs[j] * (unsigned)s->decoded[channel][i - j - 1]; s->decoded[channel][i] = get_sr_golomb_shorten(&s->gb, residual_size) + (sum >> qshift); } @@ -593,7 +593,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, /* update means with info from the current block */ if (s->nmean > 0) { - int32_t sum = (s->version < 2) ? 0 : s->blocksize / 2; + int64_t sum = (s->version < 2) ? 0 : s->blocksize / 2; for (i = 0; i < s->blocksize; i++) sum += s->decoded[channel][i]; |