]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/bink: Reorder operations in init to avoid memleak on error
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 15 Jun 2019 19:52:24 +0000 (21:52 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 16 Jun 2019 07:56:43 +0000 (09:56 +0200)
Fixes: Direct leak of 536 byte(s) in 1 object(s)
Fixes: 15266/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-5629530426834944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/bink.c

index d0f1b393217642678d18e43c6e2684c259f0d85e..8392bbeeb01d564bbd3f3d032e10616b18611e3b 100644 (file)
@@ -1333,13 +1333,13 @@ static av_cold int decode_init(AVCodecContext *avctx)
     }
     c->avctx = avctx;
 
+    if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
+        return ret;
+
     c->last = av_frame_alloc();
     if (!c->last)
         return AVERROR(ENOMEM);
 
-    if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
-        return ret;
-
     avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
     avctx->color_range = c->version == 'k' ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;