avcodec/jpeg2000dec: Use av_image_check_size2()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 17 Feb 2018 03:20:53 +0000 (04:20 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 17 Feb 2018 19:31:39 +0000 (20:31 +0100)
Fixes: OOM
Fixes: 5733/clusterfuzz-testcase-minimized-4906757966004224

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 4cf8a28..5414ce5 100644 (file)
@@ -285,7 +285,7 @@ static int get_siz(Jpeg2000DecoderContext *s)
         avpriv_request_sample(s->avctx, "Support for image offsets");
         return AVERROR_PATCHWELCOME;
     }
-    if (av_image_check_size(s->width, s->height, 0, s->avctx)) {
+    if (av_image_check_size2(s->width, s->height, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx)) {
         avpriv_request_sample(s->avctx, "Large Dimensions");
         return AVERROR_PATCHWELCOME;
     }