[libav-devel] [PATCH 08/18] jpeg2000dec: Add more checks when parsing headers

[Martin Storsjö]

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-sta...@libav.org
---
 libavcodec/jpeg2000dec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 61befdf..b01abb2 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1280,8 +1280,8 @@ static int 
jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
             Jpeg2000Tile *tile;
             Jpeg2000TilePart *tp;
 
-            if (s->curtileno < 0) {
-                av_log(s->avctx, AV_LOG_ERROR, "Missing SOT\n");
+            if (s->curtileno < 0 || !s->tile) {
+                av_log(s->avctx, AV_LOG_ERROR, "Missing SOT or SIZ\n");
                 return AVERROR_INVALIDDATA;
             }
 
-- 
1.7.9.4

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel