1. ffmpeg
  2. Commit b70f7d20e1140983bf986ca240f2d868074a8585
Browse code

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>

Michael Niedermayer authored on 2015/11/18 02:19:01
Showing 1 changed files
libavformat/matroskadec.c
History View file @ b70f7d2
... ... 
@@ -3088,6 +3088,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
3088 3088 
         tracks[i].audio.buf_timecode   = AV_NOPTS_VALUE;
3089 3089 
         tracks[i].end_timecode         = 0;
3090 3090 
         if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE &&
3091 
+            tracks[i].stream &&
3091 3092 
             tracks[i].stream->discard != AVDISCARD_ALL) {
3092 3093 
             index_sub = av_index_search_timestamp(
3093 3094 
                 tracks[i].stream, st->index_entries[index].timestamp,