From: Michael Niedermayer <[email protected]>
Avoid some overreads.
---
libavcodec/jpeg2kdec.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/libavcodec/jpeg2kdec.c b/libavcodec/jpeg2kdec.c
index 08bb07e..cf41f3e 100644
--- a/libavcodec/jpeg2kdec.c
+++ b/libavcodec/jpeg2kdec.c
@@ -423,6 +423,9 @@ static int get_sot(Jpeg2KDecoderContext *s, int n)
return AVERROR_INVALIDDATA;
Isot = bytestream2_get_be16u(&s->g); // Isot
+ if (Isot >= s->numXtiles * s->numYtiles) {
+ return AVERROR_INVALIDDATA;
+ }
if (Isot) {
avpriv_request_sample(s->avctx, "Support for more than one tile");
return AVERROR_PATCHWELCOME;
@@ -433,6 +436,16 @@ static int get_sot(Jpeg2KDecoderContext *s, int n)
/* Read TNSot but not used */
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->tile_index = Isot;
tp->tp_len = Psot;
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
