From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 29 Jan 2021 20:18:36 +0000 (+0100)
Subject: avformat/matroskadec: Check for EOF in resync loop
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5282147d0c92ac821e85b93e2db6704f4720e0c1;p=ffmpeg

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>
---

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 25eca5825e5..fa5f3d9c026 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2953,6 +2953,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;
     }
     /* Set data_offset as it might be needed later by seek_frame_generic. */
     if (matroska->current_id == MATROSKA_ID_CLUSTER)