[FFmpeg-cvslog] avcodec/jpeg2000dec: Check Psot

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 14 19:16:47 2013 +0200| [5deb96c5641c58d4c1a820971347c3f76cc945d4] | committer: Michael Niedermayer

avcodec/jpeg2000dec: Check Psot

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5deb96c5641c58d4c1a820971347c3f76cc945d4
---

 libavcodec/jpeg2000dec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index b856db4..11fa7f6 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -469,6 +469,10 @@ static int get_sot(Jpeg2000DecoderContext *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[s->curtileno].tile_part)) {
         av_log(s->avctx, AV_LOG_ERROR, "TPsot %d too big\n", TPsot);
         return AVERROR_PATCHWELCOME;