diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-02 23:16:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-27 17:50:47 +0200 |
| commit | a56b96a3dade2552efd13a30d395c135fab7f8cb (patch) | |
| tree | 625556f7e215329980e90c29a2577f6443ce547d | |
| parent | 6e26b1b0b18df60f77f6c0878438783a8b851f6f (diff) | |
| download | ffmpeg-a56b96a3dade2552efd13a30d395c135fab7f8cb.tar.gz | |
avcodec/fmvc: Check if header fields are available before allocating the image
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>
(cherry picked from commit 561cc161ca617c1b8d48fef0f02d56c0f1af0486)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/fmvc.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |