[vlc-commits] Revert "mkv/demux: Ebml_Parser: fix #18001 (memory-leak)"

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Mon Nov 13 18:08:42 2017 +0100| [dc6e8ce36c843ca7e475cb81040d85db3572d027] | committer: Jean-Baptiste Kempf

Revert "mkv/demux: Ebml_Parser: fix #18001 (memory-leak)"

This reverts commit 37fdb03acd3ec85f73edf6741c97b1a05dc4e197.

This is not the right level to decide if you can free the previous element, you
need at least to respect the "Keep" status.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dc6e8ce36c843ca7e475cb81040d85db3572d027
---

 modules/demux/mkv/Ebml_parser.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/demux/mkv/Ebml_parser.cpp b/modules/demux/mkv/Ebml_parser.cpp
index 1e3099cfac..489ff67355 100644
--- a/modules/demux/mkv/Ebml_parser.cpp
+++ b/modules/demux/mkv/Ebml_parser.cpp
@@ -250,8 +250,6 @@ EbmlElement *EbmlParser::Get( int n_call )
             }
 
             delete m_el[mi_level];
-            delete p_prev;
-
             m_el[mi_level] = NULL;
             m_el[mi_level - 1]->SkipData( *m_es, EBML_CONTEXT(m_el[mi_level - 1]) );
             return Get();