Browse Source

gifdec: check that the image dimensions are non-zero

Also add an error message an return a more suitable error code
(INVALIDDATA, not EINVAL);
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
tags/n2.2-rc1
Anton Khirnov 12 years ago
parent
commit
c453723ad7
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavcodec/gifdec.c

+ 5
- 2
libavcodec/gifdec.c View File

@@ -87,8 +87,11 @@ static int gif_read_image(GifState *s, AVFrame *frame)

/* verify that all the image is inside the screen dimensions */
if (left + width > s->screen_width ||
top + height > s->screen_height)
return AVERROR(EINVAL);
top + height > s->screen_height ||
!width || !height) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid image dimensions.\n");
return AVERROR_INVALIDDATA;
}

/* build the palette */
n = (1 << bits_per_pixel);


Loading…
Cancel
Save