diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-29 21:18:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-11 21:23:49 +0200 |
| commit | f7e195bdd31820fa5eed0aa935798658956f214c (patch) | |
| tree | 6ebc7d8ea8008eecbdbbed85b75eba4b6e8b5108 | |
| parent | e9871b10a9f0f38d227147fa90e2b95fbcbe4bab (diff) | |
| download | ffmpeg-f7e195bdd31820fa5eed0aa935798658956f214c.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 cf21cb9463..7c00b5b764 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2620,6 +2620,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); |