diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2020-09-20 21:09:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 14:18:20 +0100 |
commit | f29a6a499a3c8d02cfe85fb25537306c754b30b5 (patch) | |
tree | f84b24ebe3ca6deff37e98c3ad7038d127d7e99b | |
parent | e3508f371ecfb1afb99314d4a7621186cd84ce24 (diff) | |
download | ffmpeg-f29a6a499a3c8d02cfe85fb25537306c754b30b5.tar.gz |
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@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7170d342e597a39f48d1bedb3a2382f25a324155)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/vividas.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/vividas.c b/libavformat/vividas.c index b0f9f35ac2..3793f74c0d 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; |