diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-02 19:11:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-16 19:16:13 +0200 |
| commit | 01a694d4823c48ecc602f31a39a85aac4b7eaf66 (patch) | |
| tree | baa664e124db34525a457197d33bb7e18ab79b9c | |
| parent | 739e3ff47533746a72fd212eae4af009144921c6 (diff) | |
| download | ffmpeg-01a694d4823c48ecc602f31a39a85aac4b7eaf66.tar.gz | |
avcodec/shorten: Fix undefined addition in shorten_decode_frame()
Fixes: signed integer overflow: 1139785606 + 1454196085 cannot be represented in type 'int'
Fixes: 8937/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-6202943597445120
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 3b10bb8772c76177cc47b8d15a6970f19dd11039)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/shorten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 609ff0e26f..68c2a2d804 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -678,7 +678,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, else { int32_t sum = (s->version < 2) ? 0 : s->nmean / 2; for (i = 0; i < s->nmean; i++) - sum += s->offset[channel][i]; + sum += (unsigned)s->offset[channel][i]; coffset = sum / s->nmean; if (s->version >= 2) coffset = s->bitshift == 0 ? coffset : coffset >> s->bitshift - 1 >> 1; |