jpeg2000dec: Check ncomponents and tile dimensions
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 19:36:32 +0000 (21:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 19:44:34 +0000 (21:44 +0200)
Fixes various problems

Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c

index f7e6b6e..60489be 100644 (file)
@@ -176,6 +176,13 @@ static int get_siz(Jpeg2000DecoderContext *s)
     s->tile_offset_y  = bytestream_get_be32(&s->buf); // YT0Siz
     s->ncomponents    = bytestream_get_be16(&s->buf); // CSiz
 
+    if(s->ncomponents <= 0 || s->ncomponents > 4) {
+        av_log(s->avctx, AV_LOG_ERROR, "unsupported/invalid ncomponents: %d\n", s->ncomponents);
+        return AVERROR(EINVAL);
+    }
+    if(s->tile_width<=0 || s->tile_height<=0)
+        return AVERROR(EINVAL);
+
     if (s->buf_end - s->buf < 2 * s->ncomponents)
         return AVERROR(EINVAL);