diff options
| author | Xiaohan Wang <xhwang@chromium.org> | 2014-11-06 12:59:54 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:09 +0200 |
| commit | 46ee330d3a1e84034aadbaede606c1722210a8ff (patch) | |
| tree | 18a29a795926220f8eb118958b26e2ce5d6139a5 | |
| parent | c9edf502cd8bf2cff80a26fd368bdbc59c94c5b9 (diff) | |
| download | ffmpeg-46ee330d3a1e84034aadbaede606c1722210a8ff.tar.gz | |
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
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 33301f001747d7a542073c634cc81da5eff051cf)
Conflicts:
libavformat/matroskadec.c
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6e765d9d1a..361d9de820 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2587,7 +2587,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; @@ -2616,6 +2616,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; |