From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 1 Jul 2013 08:00:59 +0000 (+0200)
Subject: jpeg2000: Check code-block size
X-Git-Tag: android-x86-4.4-r1~364^2~787
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e;p=android-x86%2Fexternal-ffmpeg.git

jpeg2000: Check code-block size

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index e29f73162b..8fbe3493ef 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -267,6 +267,12 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
     c->log2_cblk_width  = bytestream_get_byte(&s->buf) + 2; // cblk width
     c->log2_cblk_height = bytestream_get_byte(&s->buf) + 2; // cblk height
 
+    if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 ||
+        c->log2_cblk_width + c->log2_cblk_height > 12) {
+        av_log(s->avctx, AV_LOG_ERROR, "cblk size invalid\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     c->cblk_style = bytestream_get_byte(&s->buf);
     if (c->cblk_style != 0) { // cblk style
         av_log(s->avctx, AV_LOG_ERROR, "no extra cblk styles supported\n");