aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-10-25 18:39:45 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-17 21:34:53 +0200
commit4fb6c6bcac25a47f72442dd0ff16ca6775744e12 (patch)
treee1f8c1c33acb8521b5adb1fa2c9519e317da547f
parent79b17daba5c4e09a3b32d30b02fbb24d9e96ded9 (diff)
downloadffmpeg-4fb6c6bcac25a47f72442dd0ff16ca6775744e12.tar.gz
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@niedermayer.cc> (cherry picked from commit 0afbaabdca2730d3f8d88719d64802d50b92d351) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mov.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3ead74bb4b..e6d4e360cd 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4054,6 +4054,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')) {