avcodec/shorten: Fix undefined addition in shorten_decode_frame()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 2 Jul 2018 17:11:46 +0000 (19:11 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 3 Jul 2018 23:10:28 +0000 (01:10 +0200)
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>
libavcodec/shorten.c

index 79656e7..0f49109 100644 (file)
@@ -682,7 +682,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;