From: Luca Barbato <lu_zero@gentoo.org>
Date: Sat, 11 Feb 2017 21:44:08 +0000 (+0000)
Subject: mov: Do not try to parse multiple stsd for the same track
X-Git-Tag: n3.5-dev~86^2~42
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/b446f0e98f85e2e931b476e52b319f1c49244660

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

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 11bcff0..5c9f85c 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)