From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 19 Feb 2017 19:39:13 +0000 (+0100)
Subject: avcodec/mjpegdec: Fix runtime error: left shift of negative value -507
X-Git-Tag: android-x86-7.1-r1~2051
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c91bdd4524815125e1f7d8dee22ee7a73173c39a;p=android-x86%2Fexternal-ffmpeg.git

avcodec/mjpegdec: Fix runtime error: left shift of negative value -507

Fixes: 611/clusterfuzz-testcase-5613455820193792

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

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 34a988dd94..69469c5229 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1137,7 +1137,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
                         if (s->interlaced && s->bottom_field)
                             ptr += linesize >> 1;
                         pred &= mask;
-                        *ptr= pred + (dc << point_transform);
+                        *ptr= pred + ((unsigned)dc << point_transform);
                         }else{
                             ptr16 = (uint16_t*)(s->picture_ptr->data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
                             if(y==0 && toprow){