[FFmpeg-devel] [PATCH 5/8] avformat/vividas: Fix infinite loop in header parser

Michael Niedermayer michael at niedermayer.cc
Sun Aug 11 00:09:46 EEST 2019


Fixes: Timeout (Infinite -> Finite)
Fixes: 16010/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5638616102993920

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

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index e70c9164a1..a5f33181de 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -546,6 +546,9 @@ static int viv_read_header(AVFormatContext *s)
             break;
 
         block_len = ffio_read_varlen(pb);
+        if (avio_feof(pb))
+            return AVERROR_INVALIDDATA;
+
         block_type = avio_r8(pb);
 
         if (block_type == 22) {
-- 
2.22.0



More information about the ffmpeg-devel mailing list