From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 20 Jun 2013 22:31:00 +0000 (+0200)
Subject: avcodec/jpeg2000dec: check that tp_end is after the start
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=32fc8d6db65e5dd380bafcc95a0e840d69a335d2;p=ffmpeg

avcodec/jpeg2000dec: check that tp_end is after the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index caa5ae4e91d..dc976c15fb3 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1237,6 +1237,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
 
             tile = s->tile + s->curtileno;
             tp = tile->tile_part + tile->tp_idx;
+            if (tp->tp_end < s->g.buffer) {
+                av_log(s->avctx, AV_LOG_ERROR, "Invalid tpend\n");
+                return AVERROR_INVALIDDATA;
+            }
             bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_end - s->g.buffer);
             bytestream2_skip(&s->g, tp->tp_end - s->g.buffer);