mirror of https://git.ffmpeg.org/ffmpeg.git
jpeg2000: Validate SOT parsing
Avoid some overreads. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
parent
1a3598aae7
commit
d3cb302b88
|
@ -423,6 +423,9 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
Isot = bytestream2_get_be16u(&s->g); // Isot
|
Isot = bytestream2_get_be16u(&s->g); // Isot
|
||||||
|
if (Isot >= s->numXtiles * s->numYtiles)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
if (Isot) {
|
if (Isot) {
|
||||||
avpriv_request_sample(s->avctx, "Support for more than one tile");
|
avpriv_request_sample(s->avctx, "Support for more than one tile");
|
||||||
return AVERROR_PATCHWELCOME;
|
return AVERROR_PATCHWELCOME;
|
||||||
|
@ -433,6 +436,16 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
|
||||||
/* Read TNSot but not used */
|
/* Read TNSot but not used */
|
||||||
bytestream2_get_byteu(&s->g); // TNsot
|
bytestream2_get_byteu(&s->g); // TNsot
|
||||||
|
|
||||||
|
if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) {
|
||||||
|
av_log(s->avctx, AV_LOG_ERROR, "Psot %d too big\n", Psot);
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TPsot >= FF_ARRAY_ELEMS(s->tile[Isot].tile_part)) {
|
||||||
|
avpriv_request_sample(s->avctx, "Support for %d components", TPsot);
|
||||||
|
return AVERROR_PATCHWELCOME;
|
||||||
|
}
|
||||||
|
|
||||||
tp = s->tile[s->curtileno].tile_part + TPsot;
|
tp = s->tile[s->curtileno].tile_part + TPsot;
|
||||||
tp->tile_index = Isot;
|
tp->tile_index = Isot;
|
||||||
tp->tp_len = Psot;
|
tp->tp_len = Psot;
|
||||||
|
|
Loading…
Reference in New Issue