summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-17 18:19:01 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-17 19:02:28 +0100
commita5034b324cad4c29d47ef285a30b0705e6eb0384 (patch)
tree28bcd6623b63c43ead09975510f356edc5265376 /libavformat
parentf6e5b17abb44203bf830dda93d4927ce9a1d2675 (diff)
avformat/matroskadec: Check subtitle stream before dereferencing
Unrecognized streams are not allocated Fixes: flicker-1.color1.vp91447030769.08.webm Found-by: Chris Cunningham <chcunningham@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskadec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 8d7db90e1b..424d7bfe90 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3076,6 +3076,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
tracks[i].audio.buf_timecode = AV_NOPTS_VALUE;
tracks[i].end_timecode = 0;
if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE &&
+ tracks[i].stream &&
tracks[i].stream->discard != AVDISCARD_ALL) {
index_sub = av_index_search_timestamp(
tracks[i].stream, st->index_entries[index].timestamp,