[FFmpeg-devel] [PATCH] avcodec/fmvc: Check if header fields are available before allocating the image

Michael Niedermayer michael at niedermayer.cc
Mon Jun 3 00:16:40 EEST 2019


Fixes: Timeout (15sec -> 0.5sec)
Fixes: 14846/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FMVC_fuzzer-5068322120400896

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

diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c
index 5778d7b53f..5bee96a18d 100644
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@ -402,6 +402,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     AVFrame *frame = data;
     int ret, y, x;
 
+    if (avpkt->size < 8)
+        return AVERROR_INVALIDDATA;
+
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
         return ret;
 
-- 
2.21.0



More information about the ffmpeg-devel mailing list