[vlc-commits] demux:mkv: delete the Dummy we don't want after we have skipped it in the reader

[Steve Lhomme]

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

demux:mkv: delete the Dummy we don't want after we have skipped it in the reader

Should fix #18001 again

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

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

 modules/demux/mkv/Ebml_parser.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mkv/Ebml_parser.cpp b/modules/demux/mkv/Ebml_parser.cpp
index 5f663c6a45..eb76e780eb 100644
--- a/modules/demux/mkv/Ebml_parser.cpp
+++ b/modules/demux/mkv/Ebml_parser.cpp
@@ -274,10 +274,10 @@ EbmlElement *EbmlParser::Get( int n_call )
                 return NULL;
             }
 
-            delete m_el[mi_level];
-            m_el[mi_level] = NULL;
-            m_el[mi_level - 1]->SkipData( *m_es, EBML_CONTEXT(m_el[mi_level - 1]) );
-            return Get();
+            EbmlElement *unwanted_dummy = m_el[mi_level];
+            EbmlElement *upper_dummy = Get();
+            delete unwanted_dummy;
+            return upper_dummy;
         }
     }