From 7521c4bab28ff3a622171be5b39a6b210f4263f0 Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Mon, 23 Apr 2012 16:15:31 +0000 Subject: matroska: Clear prev_pkt between seeks. The new incremental parser doesn't always clear prev_pkt, however the packet queue is cleared when seeking. Which leads to a use-after-free. Verified using Valgrind. Signed-off-by: Dale Curtis Signed-off-by: Justin Ruggles --- libavformat/matroskadec.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavformat/matroskadec.c') diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 100b97f5dd..e45cfb02c9 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2094,6 +2094,7 @@ 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; -- cgit v1.2.3