summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-29 22:17:45 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-20 15:50:15 +0100
commitfaea5b4462c4325b4ec7c150c3c31929429773cc (patch)
treeea6145f667a98a595f5a7647ec4b16f1c465beed
parent19b8db2908bf0fd248da1b2126e2592ade66c40c (diff)
avformat/vividas: Add EOF check in val_1 loop in track_header()
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>
-rw-r--r--libavformat/vividas.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index ab3947815a..a55f5c0ead 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
}