diff mbox

[FFmpeg-devel,4/4] avcodec/shorten: Fix undefined addition in shorten_decode_frame()

Message ID 20180702184511.12534-4-michael@niedermayer.cc
State Accepted
Commit 3b10bb8772c76177cc47b8d15a6970f19dd11039
Headers show

Commit Message

Michael Niedermayer July 2, 2018, 6:45 p.m. UTC 
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 79656e7757..0f491090fd 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -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;