summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-19 13:37:26 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-05-12 23:00:07 +0200
commit9548dc74d8db2bc002e1195dbd076f621f5c3ea1 (patch)
tree1c704c26f55befbb7a411e7c155fb41b070f10ac /libavformat/mov.c
parent299a56c9006b2eb8807c3e3efefb91a78fe6b3b2 (diff)
avformat/mov: Ignore duplicate CoLL
Fixes: memleak Fixes: 32146/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5377612845285376 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3ee15ff3dc..c088c9f515 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5444,6 +5444,11 @@ static int mov_read_coll(MOVContext *c, AVIOContext *pb, MOVAtom atom)
}
avio_skip(pb, 3); /* flags */
+ if (sc->coll){
+ av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate COLL\n");
+ return 0;
+ }
+
sc->coll = av_content_light_metadata_alloc(&sc->coll_size);
if (!sc->coll)
return AVERROR(ENOMEM);