Changeset 22210 in vbox

Timestamp:

Aug 12, 2009 2:00:02 PM (15 years ago)

Author:

vboxsync

Message:

IPRT/XML: do not treat all non-elements as elements (fix wrong treatment of comments)

File:

• trunk/src/VBox/Runtime/r3/xml.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -474 +474 @@
         boost::shared_ptr<Node> pNew;
 
-        if (plibNode->name)
+        if (plibNode->type == XML_ELEMENT_NODE)
             pNew = boost::shared_ptr<Node>(new ElementNode);
-        else
+        else if (plibNode->type == XML_TEXT_NODE)
             pNew = boost::shared_ptr<Node>(new ContentNode);
-
-        pNew->m->plibNode = plibNode;
-        pNew->m->pcszName = (const char*)plibNode->name;
-        pNew->m->pParent = this;
-        // store
-        m->children.push_back(pNew);
-
-        // recurse for this child element to get its own children
-        pNew->buildChildren();
+        if (pNew)
+        {
+            pNew->m->plibNode = plibNode;
+            pNew->m->pcszName = (const char*)plibNode->name;
+            pNew->m->pParent = this;
+            // store
+            m->children.push_back(pNew);
+
+            // recurse for this child element to get its own children
+            pNew->buildChildren();
+        }
 
         plibNode = plibNode->next;