From f2eb30e65469ab08b1e897e5872c040a6a174f15 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 28 Jul 2019 21:09:14 +0200 Subject: [PATCH] avcodec/eatgv: Check remaining size after the keyframe header The minimal size which unpack() will not fail on is 5 bytes Fixes: Timeout (14sec -> 77ms) (testcase 15508) Fixes: 15508/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATGV_fuzzer-5700053513011200 Fixes: 15996/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATGV_fuzzer-5751353223151616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 009ec8dc3345353b1cd2316423918533fcb89552) Signed-off-by: Michael Niedermayer --- libavcodec/eatgv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 882bf077b2..6d35fdf019 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -299,6 +299,9 @@ static int tgv_decode_frame(AVCodecContext *avctx, s->palette[i] = 0xFFU << 24 | AV_RB24(buf); buf += 3; } + if (buf_end - buf < 5) { + return AVERROR_INVALIDDATA; + } } if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)