[vlc-commits] dash: Let the parser handle the root node cleaning.

[Hugo Beauzée-Luyssen]

vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Nov 28 15:47:22 2011 +0100| [f86bd6addfa47397cddba51cb152df3739b86b54] | committer: Jean-Baptiste Kempf

dash: Let the parser handle the root node cleaning.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit e588c1f9d731fabc722c32caf783943c2ada97c2)

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

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

 modules/stream_filter/dash/dash.cpp          |    2 --
 modules/stream_filter/dash/xml/DOMParser.cpp |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/stream_filter/dash/dash.cpp b/modules/stream_filter/dash/dash.cpp
index 9794d40..6c33bd8 100644
--- a/modules/stream_filter/dash/dash.cpp
+++ b/modules/stream_filter/dash/dash.cpp
@@ -125,11 +125,9 @@ static void Close(vlc_object_t *p_obj)
     stream_sys_t                        *p_sys          = (stream_sys_t *) p_stream->p_sys;
     dash::DASHManager                   *p_dashManager  = p_sys->p_dashManager;
     dash::http::HTTPConnectionManager   *p_conManager   = p_sys->p_conManager;
-    dash::xml::Node                     *p_node         = p_sys->p_node;
 
     delete(p_conManager);
     delete(p_dashManager);
-    delete(p_node);
     free(p_sys);
 }
 /*****************************************************************************
diff --git a/modules/stream_filter/dash/xml/DOMParser.cpp b/modules/stream_filter/dash/xml/DOMParser.cpp
index c522de3..638a109 100644
--- a/modules/stream_filter/dash/xml/DOMParser.cpp
+++ b/modules/stream_filter/dash/xml/DOMParser.cpp
@@ -41,6 +41,7 @@ DOMParser::DOMParser    (stream_t *stream) :
 
 DOMParser::~DOMParser   ()
 {
+    delete this->root;
     if(this->vlc_reader)
         xml_ReaderDelete(this->vlc_reader);
     if ( this->vlc_xml )