jpeg2000: Check block length

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato 2013-10-09 06:17:12 +02:00
parent 071e29af4d
commit 1018a92219
1 changed files with 7 additions and 0 deletions

View File

@ -715,6 +715,13 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
}
cblk->length += cblk->lengthinc;
cblk->lengthinc = 0;
if (cblk->length > sizeof(cblk->data)) {
av_log(s->avctx, AV_LOG_ERROR,
"Block length %d > data size %zd\n",
cblk->length, sizeof(cblk->data));
return AVERROR_INVALIDDATA;
}
}
}
return 0;