Changeset 28199 in vbox

Timestamp:

Apr 12, 2010 12:20:33 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: xml crash fix

Location:

trunk

Files:

• include/iprt/cpp/xml.h (modified) (1 diff)
• src/VBox/Runtime/r3/xml.cpp (modified) (2 diffs)

trunk/include/iprt/cpp/xml.h

@@ -455 +455 @@
     int getLineNumber() const;
 
-    int isElement()
+    int isElement() const
     {
         return m_Type == IsElement;

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

@@ -494 +494 @@
 }
 
+/**
+ * Returns the name of the node, which is either the element name or
+ * the attribute name. For other node types it probably returns NULL.
+ * @return
+ */
 const char* Node::getName() const
 {
@@ -664 +669 @@
 {
     int i = 0;
-    Data::InternalNodesList::const_iterator
-        it,
-        last = m->children.end();
-    for (it = m->children.begin();
-         it != last;
+    for (Data::InternalNodesList::iterator it = m->children.begin();
+         it != m->children.end();
          ++it)
     {
         // export this child node if ...
-        if (    (!pcszMatch)    // the caller wants all nodes or
-             || (!strcmp(pcszMatch, (**it).getName())) // the element name matches
-           )
-        {
-            Node *pNode = (*it).get();
-            if (pNode->isElement())
-                children.push_back(static_cast<ElementNode*>(pNode));
-            ++i;
-        }
+        Node *p = it->get();
+        if (p->isElement())
+            if (    (!pcszMatch)    // the caller wants all nodes or
+                 || (!strcmp(pcszMatch, p->getName())) // the element name matches
+               )
+            {
+                children.push_back(static_cast<ElementNode*>(p));
+                ++i;
+            }
     }
     return i;