From 8e887ca1fe6ccc5f2a64850e109b27772f006761 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 9 Jun 2013 00:36:04 +0200 Subject: [PATCH] jpeg2000dec: Check bpno in decode_cblk() Fixes integer overflow in fate-redcode-demux Reviewed-by: Nicolas BERTRAND Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index af542b9c80..da510c66ac 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -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,