[FFmpeg-devel] [PATCH 1/3] avcodec/eatgv: Check remaining size after the keyframe header

Michael Niedermayer michael at niedermayer.cc
Mon Jul 29 02:09:29 EEST 2019


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 <michael at niedermayer.cc>
---
 libavcodec/eatgv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 93e291f053..77b5da1f14 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -300,6 +300,10 @@ static int tgv_decode_frame(AVCodecContext *avctx,
             s->palette[i] = 0xFFU << 24 | AV_RB24(buf);
             buf += 3;
         }
+        if (buf_end - buf < 5) {
+            av_log(avctx, AV_LOG_WARNING, "packed data truncated\n");
+            return AVERROR_INVALIDDATA;
+        }
     }
 
     if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
-- 
2.22.0



More information about the ffmpeg-devel mailing list