[FFmpeg-cvslog] avformat/mov: Disallow FTYP after streams

Michael Niedermayer git at videolan.org
Fri Nov 10 03:44:32 EET 2023


ffmpeg | branch: release/6.1 | Michael Niedermayer <michael at niedermayer.cc> | Wed Nov  8 01:37:11 2023 +0100| [422ce1f21abd0e7cf1b0f7dd11a75ec2b1322530] | committer: Michael Niedermayer

avformat/mov: Disallow FTYP after streams

Fixes: Assertion !c->fc->nb_streams failed at libavformat/mov.c:7799
Fixes: 63875/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5479178702815232

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 19fcf4313148e86aa47d81a8d5d5e8d056f1f906)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=422ce1f21abd0e7cf1b0f7dd11a75ec2b1322530
---

 libavformat/mov.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e8efccf6eb..34ca8095c2 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1222,6 +1222,8 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     int ret = ffio_read_size(pb, type, 4);
     if (ret < 0)
         return ret;
+    if (c->fc->nb_streams)
+        return AVERROR_INVALIDDATA;
 
     if (strcmp(type, "qt  "))
         c->isom = 1;



More information about the ffmpeg-cvslog mailing list