]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/fmvc: Check if header fields are available before allocating the image
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 2 Jun 2019 21:16:40 +0000 (23:16 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 21 Jun 2019 16:28:00 +0000 (18:28 +0200)
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
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/fmvc.c

index 5778d7b53f8472fcae76601513b338812ebf72f1..5bee96a18de4d4f4385a7161960f7dcc925d2a4c 100644 (file)
@@ -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;