]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/imm4: Use ff_set_dimensions()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 9 Nov 2018 22:07:23 +0000 (23:07 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 10 Nov 2018 22:48:27 +0000 (23:48 +0100)
Fixes: Out of memory
Fixes: 10970/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM4_fuzzer-5698750043914240
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/imm4.c

index a4e9b5d4d2a4c9a2f6d0290f4ca35bbeed0c3d8e..b72f0be28ef79b53657fcd0527cff50ad367331f 100644 (file)
@@ -428,8 +428,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
             av_log(avctx, AV_LOG_ERROR, "Frame size change is unsupported.\n");
             return AVERROR_INVALIDDATA;
         }
-        avctx->width = width;
-        avctx->height = height;
+        ret = ff_set_dimensions(avctx, width, height);
+        if (ret < 0)
+            return ret;
     }
 
     s->changed_size = 1;