diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-17 18:19:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-19 03:51:39 +0100 |
| commit | 89612acc81d12fd41332632840aa6d5bce6f0d12 (patch) | |
| tree | b35f8e489764265d87a3283287c18bfb41708656 | |
| parent | 7c3fc6bf06413e3ef35f13d38374a59719f4f555 (diff) | |
| download | ffmpeg-89612acc81d12fd41332632840aa6d5bce6f0d12.tar.gz | |
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>
(cherry picked from commit a5034b324cad4c29d47ef285a30b0705e6eb0384)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/matroskadec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 204fac2020..c96adc43ed 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3055,6 +3055,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, |