jpeg2000dec: return error for invalid cdxy values
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 21:05:13 +0000 (23:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 21:31:19 +0000 (23:31 +0200)
Fixes division by 0

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

index 921362f..e8e95a1 100644 (file)
@@ -194,6 +194,8 @@ static int get_siz(Jpeg2000DecoderContext *s)
         s->cdy[i]    = bytestream2_get_byteu(&s->g);
         if (s->cdx[i] != 1 || s->cdy[i] != 1) {
             av_log(s->avctx, AV_LOG_ERROR, "unsupported/ CDxy values %d %d for component %d\n", s->cdx[i], s->cdy[i], i);
+            if (!s->cdx[i] || !s->cdy[i])
+                return AVERROR_INVALIDDATA;
         }
     }