[FFmpeg-cvslog] mov: Do not try to parse multiple stsd for the same track

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Feb 11 21:44:08 2017 +0000| [b446f0e98f85e2e931b476e52b319f1c49244660] | committer: Luca Barbato

mov: Do not try to parse multiple stsd for the same track

Bug-Id: 1017
CC: libav-stable at libav.org

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b446f0e98f85e2e931b476e52b319f1c49244660
---

 libavformat/mov.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 11bcff035c..5c9f85c738 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1911,6 +1911,12 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     avio_rb24(pb); /* flags */
     entries = avio_rb32(pb);
 
+    if (sc->extradata) {
+        av_log(c->fc, AV_LOG_ERROR,
+               "Duplicate stsd found in this track.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* Prepare space for hosting multiple extradata. */
     sc->extradata = av_mallocz_array(entries, sizeof(*sc->extradata));
     if (!sc->extradata)