]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mov: Check for duplicate st3d
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 Jan 2021 15:28:08 +0000 (16:28 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 10 Feb 2021 11:28:30 +0000 (12:28 +0100)
Fixes: memleak
Fixes: 29585/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6594188688490496
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c

index 9406e42f49f8b9d6685ecbc1f86d4dbf1f25bd67..dfe9be40a9be4932e037fe7e60d978d15f04b954 100644 (file)
@@ -5557,6 +5557,10 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         av_log(c->fc, AV_LOG_ERROR, "Empty stereoscopic video box\n");
         return AVERROR_INVALIDDATA;
     }
+
+    if (sc->stereo3d)
+        return AVERROR_INVALIDDATA;
+
     avio_skip(pb, 4); /* version + flags */
 
     mode = avio_r8(pb);