[FFmpeg-cvslog] avformat/mov: Check if hoov is at the end

Michael Niedermayer git at videolan.org
Sat Dec 19 21:23:29 EET 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Oct 25 18:39:45 2020 +0100| [0afbaabdca2730d3f8d88719d64802d50b92d351] | committer: Michael Niedermayer

avformat/mov: Check if hoov is at the end

Fixes: Timeout, probably infinite loop
Fixes: 26559/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5391165484171264

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 710a15dea8..c6a2d9c388 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7006,6 +7006,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom)
                 uint32_t type;
                 avio_skip(pb, 4);
                 type = avio_rl32(pb);
+                if (avio_feof(pb))
+                    break;
                 avio_seek(pb, -8, SEEK_CUR);
                 if (type == MKTAG('m','v','h','d') ||
                     type == MKTAG('c','m','o','v')) {



More information about the ffmpeg-cvslog mailing list