[FFmpeg-devel] [PATCH 1/4] avformat/mov: Disallow duplicate smdm

Michael Niedermayer michael at niedermayer.cc
Fri Dec 3 19:19:53 EET 2021


Fixes: memleak
Fixes: 39879/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5327819907923968

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavformat/mov.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 5c74d099dae..e34453432d3 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5405,6 +5405,9 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         av_log(c->fc, AV_LOG_WARNING, "Unsupported Mastering Display Metadata box version %d\n", version);
         return 0;
     }
+    if (sc->mastering)
+        return AVERROR_INVALIDDATA;
+
     avio_skip(pb, 3); /* flags */
 
     sc->mastering = av_mastering_display_metadata_alloc();
-- 
2.17.1



More information about the ffmpeg-devel mailing list