From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 3 Dec 2016 12:39:56 +0000 (+0100)
Subject: avformat/ffmdec: Check media type for chunks
X-Git-Tag: android-x86-7.1-r1~2829
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e706e2e775730db5dfa9103628cd70704dd13cef;p=android-x86%2Fexternal-ffmpeg.git

avformat/ffmdec: Check media type for chunks

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index a8c601b8b3..c76c3e5276 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -381,7 +381,7 @@ static int ffm2_read_header(AVFormatContext *s)
             }
             break;
         case MKBETAG('S', 'T', 'V', 'I'):
-            if (f_stvi++) {
+            if (f_stvi++ || codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
                 ret = AVERROR(EINVAL);
                 goto fail;
             }
@@ -445,7 +445,7 @@ static int ffm2_read_header(AVFormatContext *s)
             avio_rb32(pb); // refs
             break;
         case MKBETAG('S', 'T', 'A', 'U'):
-            if (f_stau++) {
+            if (f_stau++ || codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
                 ret = AVERROR(EINVAL);
                 goto fail;
             }
@@ -474,7 +474,7 @@ static int ffm2_read_header(AVFormatContext *s)
             }
             break;
         case MKBETAG('S', '2', 'V', 'I'):
-            if (f_stvi++ || !size) {
+            if (f_stvi++ || !size || codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
                 ret = AVERROR(EINVAL);
                 goto fail;
             }
@@ -492,7 +492,7 @@ static int ffm2_read_header(AVFormatContext *s)
                 goto fail;
             break;
         case MKBETAG('S', '2', 'A', 'U'):
-            if (f_stau++ || !size) {
+            if (f_stau++ || !size || codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
                 ret = AVERROR(EINVAL);
                 goto fail;
             }