From 73ffab41959a17650d552dceefbb11e524a430d4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 22 May 2013 02:31:03 +0200 Subject: [PATCH] jpeg2000dec: check TPsot Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 4e03e0ebe2..125aacded6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -432,6 +432,11 @@ static int get_sot(Jpeg2000DecoderContext *s, int n) /* Read TNSot but not used */ bytestream2_get_byteu(&s->g); // TNsot + if (TPsot >= FF_ARRAY_ELEMS(s->tile[s->curtileno].tile_part)) { + av_log(s->avctx, AV_LOG_ERROR, "TPsot %d too big\n", TPsot); + return AVERROR_PATCHWELCOME; + } + tp = s->tile[s->curtileno].tile_part + TPsot; tp->tile_index = Isot; tp->tp_len = Psot;