aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-19 13:30:17 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-09 22:02:20 +0200
commit75b816f2c4f6482fb02425535ba97e34e94f4ccb (patch)
tree18898a2942b5fdfc6574e93df8f81840d81b4e91
parent29052446dc86194e9e1cf2c6057145c1384890ea (diff)
downloadffmpeg-75b816f2c4f6482fb02425535ba97e34e94f4ccb.tar.gz
avformat/mov: Limit nb_chapter_tracks to input size
Fixes: Timeout (15k loop iterations instead of 400m) Fixes: 31368/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6601583174483968 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 299a56c9006b2eb8807c3e3efefb91a78fe6b3b2) 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 ad17473205..7ad70fcfb6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4097,6 +4097,8 @@ static int mov_read_chap(MOVContext *c, AVIOContext *pb, MOVAtom atom)
for (i = 0; i < num && !pb->eof_reached; i++)
c->chapter_tracks[i] = avio_rb32(pb);
+ c->nb_chapter_tracks = i;
+
return 0;
}