avcodec/jpeg2000dec: Port tile size check from j2kdec
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 22 May 2013 01:12:44 +0000 (03:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 May 2013 01:16:52 +0000 (03:16 +0200)
Fixes potential integer overflow

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

index 125aacd..a43cc7e 100644 (file)
@@ -192,6 +192,9 @@ static int get_siz(Jpeg2000DecoderContext *s)
     s->numXtiles = ff_jpeg2000_ceildiv(s->width  - s->tile_offset_x, s->tile_width);
     s->numYtiles = ff_jpeg2000_ceildiv(s->height - s->tile_offset_y, s->tile_height);
 
+    if(s->numXtiles * (uint64_t)s->numYtiles > INT_MAX/sizeof(Jpeg2000Tile))
+        return AVERROR(EINVAL);
+
     s->tile = av_mallocz(s->numXtiles * s->numYtiles * sizeof(*s->tile));
     if (!s->tile)
         return AVERROR(ENOMEM);