From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 21 May 2017 19:49:54 +0000 (+0200)
Subject: avcodec/mjpegdec: Fix runtime error: signed integer overflow: -32767 * 130560 cannot... 
X-Git-Tag: android-x86-7.1-r1~223
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=40fa6a2fa2c255293a780a194eecae5df52644a1;p=android-x86%2Fexternal-ffmpeg.git

avcodec/mjpegdec: Fix runtime error: signed integer overflow: -32767 * 130560 cannot be represented in type 'int'

Fixes: 1724/clusterfuzz-testcase-minimized-4842395432648704

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ed381de66a..5cdb489028 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -757,7 +757,7 @@ static int decode_dc_progressive(MJpegDecodeContext *s, int16_t *block,
                                  int component, int dc_index,
                                  uint16_t *quant_matrix, int Al)
 {
-    int val;
+    unsigned val;
     s->bdsp.clear_block(block);
     val = mjpeg_decode_dc(s, dc_index);
     if (val == 0xfffff) {