summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-01-31 16:28:08 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-02-10 12:28:30 +0100
commit658f0606cba0f866714cbe09af30ec40c4168930 (patch)
tree60dd1ccccf5c5fc7987a8d7fc476b378e3eac024
parent6c64351bb1f4dc148069a37754b746fcd4c784cf (diff)
avformat/mov: Check for duplicate st3d
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>
-rw-r--r--libavformat/mov.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9406e42f49..dfe9be40a9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -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);