| From 2266b8bc3370856d874334ba62b337ce4f1eb255 Mon Sep 17 00:00:00 2001 |
| From: Kai Kang <kai.kang@windriver.com> |
| Date: Wed, 13 May 2015 16:46:06 +0800 |
| Subject: [PATCH 2/2] gst-ffmpeg: fix CVE-2014-7933 |
| |
| Upstream-Status: Backport |
| |
| http://git.videolan.org/?p=ffmpeg.git;a=commit;h=33301f00 |
| |
| Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| --- |
| gst-libs/ext/libav/libavformat/matroskadec.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/gst-libs/ext/libav/libavformat/matroskadec.c b/gst-libs/ext/libav/libavformat/matroskadec.c |
| index 59dce4f..e5f5fc1 100644 |
| --- a/gst-libs/ext/libav/libavformat/matroskadec.c |
| +++ b/gst-libs/ext/libav/libavformat/matroskadec.c |
| @@ -1916,7 +1916,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, |
| int64_t timestamp, int flags) |
| { |
| MatroskaDemuxContext *matroska = s->priv_data; |
| - MatroskaTrack *tracks = matroska->tracks.elem; |
| + MatroskaTrack *tracks = NULL; |
| AVStream *st = s->streams[stream_index]; |
| int i, index, index_sub, index_min; |
| |
| @@ -1939,6 +1939,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, |
| return 0; |
| |
| index_min = index; |
| + tracks = matroska->tracks.elem; |
| for (i=0; i < matroska->tracks.nb_elem; i++) { |
| tracks[i].audio.pkt_cnt = 0; |
| tracks[i].audio.sub_packet_cnt = 0; |
| -- |
| 1.9.1 |
| |