jpeg2000dec: read and check curtileno
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 22 May 2013 00:29:00 +0000 (02:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 May 2013 00:29:49 +0000 (02:29 +0200)
Fixes out of array accesses
Code ported from j2kdec

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

index 4768f7e..4e03e0e 100644 (file)
@@ -416,7 +416,11 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
     if (bytestream2_get_bytes_left(&s->g) < 8)
         return AVERROR(EINVAL);
 
-    Isot = bytestream2_get_be16u(&s->g);        // Isot
+    s->curtileno = Isot = bytestream2_get_be16u(&s->g);        // Isot
+    if((unsigned)s->curtileno >= s->numXtiles * s->numYtiles){
+        s->curtileno=0;
+        return AVERROR(EINVAL);
+    }
     if (Isot) {
         av_log(s->avctx, AV_LOG_ERROR,
                "Not a DCINEMA JP2K file: more than one tile\n");