avcodec/jpeg2000dec: Handle Psot = 0
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 12:43:03 +0000 (14:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 12:43:03 +0000 (14:43 +0200)
Fixes Ticket2869

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c

index ba0d259..c5a3bd2 100644 (file)
@@ -602,6 +602,9 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
     /* Read TNSot but not used */
     bytestream2_get_byteu(&s->g);               // TNsot
 
+    if (!Psot)
+        Psot = bytestream2_get_bytes_left(&s->g) + n + 2;
+
     if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) {
         av_log(s->avctx, AV_LOG_ERROR, "Psot %"PRIu32" too big\n", Psot);
         return AVERROR_INVALIDDATA;