[FFmpeg-devel] [PATCH 2/4] avformat/vividas: Check for EOF in first loop in track_header()

Michael Niedermayer michael at niedermayer.cc
Sun Sep 20 23:26:06 EEST 2020


Fixes: timeout (243sec -> a few ms)
Fixes: 25716/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5764093666131968

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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index 36c007b0d2..7917df5d64 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -293,6 +293,8 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s,  uint8_t *
 
     for (i=0;i<val_1;i++) {
         int c = avio_r8(pb);
+        if (avio_feof(pb))
+            return AVERROR_EOF;
         for (j=0;j<c;j++) {
             if (avio_feof(pb))
                 return AVERROR_EOF;
-- 
2.17.1



More information about the ffmpeg-devel mailing list