Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e': jpeg2000: Check code-block size Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3f0364327c
@ -284,7 +284,7 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
|
|||||||
c->log2_cblk_height = (bytestream2_get_byteu(&s->g) & 15) + 2; // cblk height
|
c->log2_cblk_height = (bytestream2_get_byteu(&s->g) & 15) + 2; // cblk height
|
||||||
|
|
||||||
if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 ||
|
if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 ||
|
||||||
c->log2_cblk_width + c->log2_cblk_height > 14) {
|
c->log2_cblk_width + c->log2_cblk_height > 12) {
|
||||||
av_log(s->avctx, AV_LOG_ERROR, "cblk size invalid\n");
|
av_log(s->avctx, AV_LOG_ERROR, "cblk size invalid\n");
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user