[FFmpeg-devel,4/4] avformat/vividas: Add EOF check in val_1 loop in track_header()

Submitted by Michael Niedermayer on Oct. 29, 2019, 10:35 p.m.

Details

Message ID 20191029223505.20667-4-michael@niedermayer.cc
State Accepted
Commit faea5b4462c4325b4ec7c150c3c31929429773cc
Headers show

Commit Message

Michael Niedermayer Oct. 29, 2019, 10:35 p.m.
Fixes: Timeout (148sec -> 0.1sec)
Fixes: 18427/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5682124627116032

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

Patch hide | download patch | download mbox

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index efe1b8deff..049414a413 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -295,6 +295,8 @@  static int track_header(VividasDemuxContext *viv, AVFormatContext *s,  uint8_t *
     for (i=0;i<val_1;i++) {
         int c = avio_r8(pb);
         for (j=0;j<c;j++) {
+            if (avio_feof(pb))
+                return AVERROR_EOF;
             avio_r8(pb); // val_3
             avio_r8(pb); // val_4
         }