diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-12-03 17:42:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-04-07 16:26:59 +0200 |
| commit | 1f62d58dae20489c37558f327d9bed47e58870d4 (patch) | |
| tree | 62aacf3ce26a0997781a77b03fd3efe659d3f6af | |
| parent | 6711c16e6356369ba34cfd487a7fff194ab09d1c (diff) | |
| download | ffmpeg-1f62d58dae20489c37558f327d9bed47e58870d4.tar.gz | |
avformat/mov: Disallow duplicate smdm
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@niedermayer.cc>
(cherry picked from commit b5ba74053c1ef9f38d9e7b3a036675f06d2b2714)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 987b0c0496..b52a72fe30 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5341,6 +5341,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(); |