Commit 1e512388 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/ffmdec: Check media type for chunks

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e706e2e7)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 31d46dc9
...@@ -351,7 +351,7 @@ static int ffm2_read_header(AVFormatContext *s) ...@@ -351,7 +351,7 @@ static int ffm2_read_header(AVFormatContext *s)
} }
break; break;
case MKBETAG('S', 'T', 'V', 'I'): case MKBETAG('S', 'T', 'V', 'I'):
if (f_stvi++) { if (f_stvi++ || codec->codec_type != AVMEDIA_TYPE_VIDEO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
...@@ -412,7 +412,7 @@ static int ffm2_read_header(AVFormatContext *s) ...@@ -412,7 +412,7 @@ static int ffm2_read_header(AVFormatContext *s)
codec->refs = avio_rb32(pb); codec->refs = avio_rb32(pb);
break; break;
case MKBETAG('S', 'T', 'A', 'U'): case MKBETAG('S', 'T', 'A', 'U'):
if (f_stau++) { if (f_stau++ || codec->codec_type != AVMEDIA_TYPE_AUDIO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
...@@ -438,7 +438,7 @@ static int ffm2_read_header(AVFormatContext *s) ...@@ -438,7 +438,7 @@ static int ffm2_read_header(AVFormatContext *s)
} }
break; break;
case MKBETAG('S', '2', 'V', 'I'): case MKBETAG('S', '2', 'V', 'I'):
if (f_stvi++ || !size) { if (f_stvi++ || !size || codec->codec_type != AVMEDIA_TYPE_VIDEO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
...@@ -453,7 +453,7 @@ static int ffm2_read_header(AVFormatContext *s) ...@@ -453,7 +453,7 @@ static int ffm2_read_header(AVFormatContext *s)
goto fail; goto fail;
break; break;
case MKBETAG('S', '2', 'A', 'U'): case MKBETAG('S', '2', 'A', 'U'):
if (f_stau++ || !size) { if (f_stau++ || !size || codec->codec_type != AVMEDIA_TYPE_AUDIO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment