[vlc-devel] [PATCH] demux/adaptive: DOMParser: retain root element if empty

Filip Roséen filip at atch.se
Wed Mar 15 10:06:48 CET 2017

An XML file containing a single root element without children would,
given the previous implementation, have its only element ignored.
Resulting in a memory-leak of the node in question, while also (more
importantly) making it impossible to access the associated data.

As XML does not allow documents such as the below (only a single root
is allowed):

   <?xml version="1.0">
   <ill-formed />

Simply checking to see so that we are not popping away all our tags
are sufficient in order to fix this bug. The changes also make sure
that we do not invoke std::stack<...>::pop on an empty container
(which is undefined-behavior).

fixes: #18122
 modules/demux/adaptive/xml/DOMParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/xml/DOMParser.cpp b/modules/demux/adaptive/xml/DOMParser.cpp
index a8a6621b34..648c14b348 100644
--- a/modules/demux/adaptive/xml/DOMParser.cpp
+++ b/modules/demux/adaptive/xml/DOMParser.cpp
@@ -112,7 +112,7 @@ Node* DOMParser::processNode(bool b_strict)
-                if(empty)
+                if(empty && lifo.size() > 1)

More information about the vlc-devel mailing list