diff mbox series

[FFmpeg-devel,6/7] avcodec/fmvc: avoid copying uninitialized data

Message ID 20210202231334.24412-6-michael@niedermayer.cc
State Accepted
Commit b24d3bfe66b5cc4eb5dbd0e2f2fdb51aa4f901a2
Headers show
Series [FFmpeg-devel,1/7] avformat/utils: Extend overflow check in dts wrap in compute_pkt_fields() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Michael Niedermayer Feb. 2, 2021, 11:13 p.m. UTC 
Fixes: Timeout
Fixes: 30049/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FMVC_fuzzer-5986909455253504

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/fmvc.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Feb. 13, 2021, 8:40 p.m. UTC | #1 
On Wed, Feb 03, 2021 at 12:13:33AM +0100, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 30049/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FMVC_fuzzer-5986909455253504
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/fmvc.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c
index 5bee96a18d..3701b0849b 100644
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@ -440,6 +440,8 @@  static int decode_frame(AVCodecContext *avctx, void *data,
             memcpy(dst, src, avctx->width * s->bpp);
             dst -= frame->linesize[0];
             src += s->stride * 4;
+            if (bytestream2_tell_p(pb) < y*s->stride * 4)
+                break;
         }
     } else {
         unsigned block, nb_blocks;