diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-11-09 23:07:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-01-21 07:53:25 +0100 |
| commit | b66152a4e5e578c731f7e59e43f4db6b77d7c6d6 (patch) | |
| tree | 0e0d2b08f4995f930cde323f979d29045cb9151f | |
| parent | ac50246cc49add4e53d6716afd454dbe86666efd (diff) | |
| download | ffmpeg-b66152a4e5e578c731f7e59e43f4db6b77d7c6d6.tar.gz | |
avcodec/imm4: Use ff_set_dimensions()
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>
(cherry picked from commit c305e134ce23b46a1164527ade3e1b7e2ecedf5f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/imm4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index a4e9b5d4d2..b72f0be28e 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -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; |