OSDN Git Service

avcodec/jpeg2000dec: Check tile offsets
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 24 May 2017 17:40:42 +0000 (19:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 24 May 2017 17:41:15 +0000 (19:41 +0200)
Fixes: runtime error: signed integer overflow: 4096 - -2147483648 cannot be represented in type 'int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/jpeg2000dec.c

index ab814ca..d142565 100644 (file)
@@ -298,6 +298,14 @@ static int get_siz(Jpeg2000DecoderContext *s)
         return AVERROR_PATCHWELCOME;
     }
 
+    if (s->tile_offset_x < 0 || s->tile_offset_y < 0 ||
+        s->image_offset_x < s->tile_offset_x ||
+        s->image_offset_y < s->tile_offset_y) {
+        av_log(s->avctx, AV_LOG_ERROR, "Tile offsets are invalid\n",
+               s->ncomponents);
+        return AVERROR_INVALIDDATA;
+    }
+
     s->ncomponents = ncomponents;
 
     if (s->tile_width <= 0 || s->tile_height <= 0) {