Hello ffmpeg-devel:
This is my first patch to FFmpeg, let me know if I am doing anything wrong
:)
This is a small patch to fix a read-after-free error in matroskadec.c.
Please take a look.
Xiaohan
From 45a523e9213cc887aa90cdf4953e66918b34f689 Mon Sep 17 00:00:00 2001
From: Xiaohan Wang <xhw...@chromium.org>
Date: Thu, 6 Nov 2014 12:59:54 -0800
Subject: [PATCH] Fix read-after-free in matroska_read_seek().
In matroska_read_seek(), |tracks| is assigned at the begining of the function.
However, functions like matroska_parse_cues() could reallocate the tracks so
that |tracks| can get invalidated.
This CL assigns |tracks| only before we use it so that it won't be invalidated.
BUG=427266
TEST=Test case in associated bug passes now.
Change-Id: I9c7065fe8f4311ca846076281df2282d190ed344
---
libavformat/matroskadec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5abf0f8..42dbd81 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2925,7 +2925,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;
@@ -2955,6 +2955,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
goto err;
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;
--
2.1.0.rc2.206.gedb03e5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
