diff mbox

[FFmpeg-devel,1/3] avcodec/imm4: Use ff_set_dimensions()

Message ID 20181109220725.8649-1-michael@niedermayer.cc
State Accepted
Commit c305e134ce23b46a1164527ade3e1b7e2ecedf5f
Headers show

Commit Message

Michael Niedermayer Nov. 9, 2018, 10:07 p.m. UTC 
Fixes: Out of memory
Fixes: 10970/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM4_fuzzer-5698750043914240

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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Paul B Mahol Nov. 9, 2018, 10:20 p.m. UTC | #1 
On 11/9/18, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: Out of memory
> Fixes:
> 10970/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM4_fuzzer-5698750043914240
>
> 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 | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

OK
Michael Niedermayer Nov. 10, 2018, 10:49 p.m. UTC | #2 
On Fri, Nov 09, 2018 at 11:20:45PM +0100, Paul B Mahol wrote:
> On 11/9/18, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > Fixes: Out of memory
> > Fixes:
> > 10970/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM4_fuzzer-5698750043914240
> >
> > 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 | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> OK

will apply

thanks

[...]
diff mbox

Patch

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;