[FFmpeg-cvslog] avcodec/imm4: Use ff_set_dimensions()

Michael Niedermayer git at videolan.org
Sun Nov 11 01:12:35 EET 2018


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Nov  9 23:07:23 2018 +0100| [c305e134ce23b46a1164527ade3e1b7e2ecedf5f] | committer: Michael Niedermayer

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 at gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c305e134ce23b46a1164527ade3e1b7e2ecedf5f
---

 libavcodec/imm4.c | 5 +++--
 1 file 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;



More information about the ffmpeg-cvslog mailing list