Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 2266b8bc3370856d874334ba62b337ce4f1eb255 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Wed, 13 May 2015 16:46:06 +0800 |
| 4 | Subject: [PATCH 2/2] gst-ffmpeg: fix CVE-2014-7933 |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | |
| 8 | http://git.videolan.org/?p=ffmpeg.git;a=commit;h=33301f00 |
| 9 | |
| 10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 11 | --- |
| 12 | gst-libs/ext/libav/libavformat/matroskadec.c | 3 ++- |
| 13 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/gst-libs/ext/libav/libavformat/matroskadec.c b/gst-libs/ext/libav/libavformat/matroskadec.c |
| 16 | index 59dce4f..e5f5fc1 100644 |
| 17 | --- a/gst-libs/ext/libav/libavformat/matroskadec.c |
| 18 | +++ b/gst-libs/ext/libav/libavformat/matroskadec.c |
| 19 | @@ -1916,7 +1916,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, |
| 20 | int64_t timestamp, int flags) |
| 21 | { |
| 22 | MatroskaDemuxContext *matroska = s->priv_data; |
| 23 | - MatroskaTrack *tracks = matroska->tracks.elem; |
| 24 | + MatroskaTrack *tracks = NULL; |
| 25 | AVStream *st = s->streams[stream_index]; |
| 26 | int i, index, index_sub, index_min; |
| 27 | |
| 28 | @@ -1939,6 +1939,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, |
| 29 | return 0; |
| 30 | |
| 31 | index_min = index; |
| 32 | + tracks = matroska->tracks.elem; |
| 33 | for (i=0; i < matroska->tracks.nb_elem; i++) { |
| 34 | tracks[i].audio.pkt_cnt = 0; |
| 35 | tracks[i].audio.sub_packet_cnt = 0; |
| 36 | -- |
| 37 | 1.9.1 |
| 38 | |