GitList

Browse code

j2kdec: Check for interger overflow in tile array allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3132999fdb57d8d3ba5e08a4dc1b3661e885c04d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2011/12/24 13:03:04
Showing 1 changed files

libavcodec/j2kdec.c

History View file @ f41e935

@@ -238,6 +238,9 @@ static int get_siz(J2kDecoderContext *s)
                          s->numXtiles = ff_j2k_ceildiv(s->width - s->tile_offset_x, s->tile_width);
                          s->numYtiles = ff_j2k_ceildiv(s->height - s->tile_offset_y, s->tile_height);
                     +    if(s->numXtiles * (uint64_t)s->numYtiles > INT_MAX/sizeof(J2kTile))
                     +        return AVERROR(EINVAL);
+                    +
                          s->tile = av_mallocz(s->numXtiles * s->numYtiles * sizeof(J2kTile));
                          if (!s->tile)
                              return AVERROR(ENOMEM);