From f253de24af2acb6a60a0b22d3a891e3a9d6cd2c0 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Fri, 19 Aug 2011 21:10:10 +0300
Subject: demux_mkv: remove bad mkv_free() from 0ece360eeaf9

demuxer.c calls demuxer->close() even if opening failed. Thus the
mkv_free() call added in 0ece360eeaf95f ("demux_mkv: skip files faster
in ordered chapter file search") was wrong, and could cause a crash
from a double free if some data structures were allocated before the
opening attempt was aborted.
---
 libmpdemux/demux_mkv.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libmpdemux')

diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 692bec9ecf..4da94ac99d 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1701,7 +1701,6 @@ static int demux_mkv_open(demuxer_t *demuxer)
         default:;
             int res = read_header_element(demuxer, id, 0);
             if (res == -2) {
-                mkv_free(demuxer);
                 return 0;
             } else if (res < 1)
                 goto headersdone;
-- 
cgit v1.2.3