aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-06-08 18:14:21 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-06-12 14:22:42 +0200
commitf54d85cee64b98bca5d2bee703f2a266ea75dce7 (patch)
tree429433c62069db84b2f42c77041ddafa031ac401 /libavformat/mov.c
parent1e24da5cfe1cec70e322b93578227465f325936e (diff)
downloadffmpeg-f54d85cee64b98bca5d2bee703f2a266ea75dce7.tar.gz
avformat/mov: Check for duplicate mdcv
Fixes: memleak Fixes: 34932/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5456227658235904 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6c99a67ff5..47a8e41236 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5396,7 +5396,7 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data;
- if (atom.size < 24) {
+ if (atom.size < 24 || sc->mastering) {
av_log(c->fc, AV_LOG_ERROR, "Invalid Mastering Display Color Volume box\n");
return AVERROR_INVALIDDATA;
}