diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 12:43:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 13:01:07 +0100 |
| commit | 6fc064893270be7549eccc78fd085ca8521ad9f2 (patch) | |
| tree | 6ecde3cda9eca227db9e72b76b4034c463c64a1d /libavformat/matroskadec.c | |
| parent | 8bfc8d88be9be07c53aa290515d022c9a938e18d (diff) | |
| parent | 7b8c5b263bc680eff5710bee5994de39d47fc15e (diff) | |
Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'
* commit '7b8c5b263bc680eff5710bee5994de39d47fc15e':
vc1dec: prevent a crash due missing pred_flag parameter
matroska: Fix use after free
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4da4f1851f..87c4a39d0e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1881,6 +1881,7 @@ static int matroska_deliver_packet(MatroskaDemuxContext *matroska, */ static void matroska_clear_queue(MatroskaDemuxContext *matroska) { + matroska->prev_pkt = NULL; if (matroska->packets) { int n; for (n = 0; n < matroska->num_packets; n++) { @@ -2388,7 +2389,6 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET); matroska->current_id = 0; while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { - matroska->prev_pkt = NULL; matroska_clear_queue(matroska); if (matroska_parse_cluster(matroska) < 0) break; |