From: Michael Niedermayer <michael@niedermayer.cc>
Date: Mon, 5 Jun 2017 20:23:15 +0000 (+0200)
Subject: avcodec/mjpegdec: Check that reference frame matches the current frame
X-Git-Tag: android-x86-7.1-r1~58
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-ffmpeg.git;a=commitdiff_plain;h=4705edbbb96e193f51c72248f508ae5693702a48

avcodec/mjpegdec: Check that reference frame matches the current frame

Fixes: out of array read
Fixes: 2097/clusterfuzz-testcase-minimized-5036861833609216

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 5cdb489028..e4e99e04e2 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1501,6 +1501,15 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
         return -1;
     }
 
+    if (reference) {
+        if (reference->width  != s->picture_ptr->width  ||
+            reference->height != s->picture_ptr->height ||
+            reference->format != s->picture_ptr->format) {
+            av_log(s->avctx, AV_LOG_ERROR, "Reference mismatching\n");
+            return AVERROR_INVALIDDATA;
+        }
+    }
+
     av_assert0(s->picture_ptr->data[0]);
     /* XXX: verify len field validity */
     len = get_bits(&s->gb, 16);