[FFmpeg-cvslog] avformat/vividas: Check for EOF in first loop in track_header()

Michael Niedermayer git at videolan.org
Mon Sep 21 13:02:59 EEST 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Sep 20 21:09:31 2020 +0200| [7170d342e597a39f48d1bedb3a2382f25a324155] | committer: Michael Niedermayer

avformat/vividas: Check for EOF in first loop in track_header()

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
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7170d342e597a39f48d1bedb3a2382f25a324155
---

 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;



More information about the ffmpeg-cvslog mailing list