mirror of https://git.ffmpeg.org/ffmpeg.git
jpeg2000: Check block length
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
This commit is contained in:
parent
071e29af4d
commit
1018a92219
|
@ -715,6 +715,13 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
|
||||||
}
|
}
|
||||||
cblk->length += cblk->lengthinc;
|
cblk->length += cblk->lengthinc;
|
||||||
cblk->lengthinc = 0;
|
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;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue