diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-29 21:18:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:53:29 +0200 |
| commit | 7b660aa875dcedaca8cf01066a7f03e3ef9ccdb5 (patch) | |
| tree | 810d502f4e8375d2379a700e9181b602c8b7c06f | |
| parent | 727711d842ceb8490d37cc4f6b0080f185f748b8 (diff) | |
| download | ffmpeg-7b660aa875dcedaca8cf01066a7f03e3ef9ccdb5.tar.gz | |
avformat/matroskadec: Check for EOF in resync loop
Fixes: Timeout (too long -> instantly)
Fixes: 29136/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-4586141227548672
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5282147d0c92ac821e85b93e2db6704f4720e0c1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 98913dfdb6..5a83e8af89 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2653,6 +2653,8 @@ static int matroska_read_header(AVFormatContext *s) goto fail; pos = avio_tell(matroska->ctx->pb); res = ebml_parse(matroska, matroska_segment, matroska); + if (res == AVERROR(EIO)) // EOF is translated to EIO, this exists the loop on EOF + goto fail; } matroska_execute_seekhead(matroska); |