jpeg2000dec: Check bpno in decode_cblk()
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 22:36:04 +0000 (00:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Jun 2013 15:13:46 +0000 (17:13 +0200)
Fixes integer overflow in fate-redcode-demux

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c

index af542b9..da510c6 100644 (file)
@@ -901,6 +901,10 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
     ff_mqc_initdec(&t1->mqc, cblk->data);
 
     while (passno--) {
+        if (bpno < 0) {
+            av_log(s->avctx, AV_LOG_ERROR, "bpno invalid\n");
+            return AVERROR(EINVAL);
+        }
         switch(pass_t) {
         case 0:
             decode_sigpass(t1, width, height, bpno + 1, bandpos,