Fix node iteration & return errors on invalid XML string

Author: Lpsd

Shared/XML/CXMLImpl.cpp

@@ -46,35 +46,52 @@ void CXMLImpl::DeleteXML(CXMLFile* pFile)
 
 CXMLNode* CXMLImpl::ParseString(const char* strXmlContent)
 {
-    TiXmlElement    *xmlRoot;
-    TiXmlNode       *xmlChild;
-    CXMLNodeImpl    *xmlRootNode;
-    CXMLNode        *xmlChildNode;
-
+    TiXmlElement    *xmlDocumentRoot;
+    CXMLNodeImpl    *xmlBaseNode;
+    CXMLNode    *xmlRootNode;
+    
     TiXmlDocument*  xmlDoc = new TiXmlDocument();
 
     if (xmlDoc)
-    {
-        xmlDoc->Parse(strXmlContent, 0, TIXML_ENCODING_UTF8);
+    {   
+        if (xmlDoc->Parse(strXmlContent, 0, TIXML_ENCODING_UTF8))
+        {
+            xmlDocumentRoot = xmlDoc->RootElement();
 
-        xmlRoot = xmlDoc->RootElement();
+            xmlBaseNode = new CXMLNodeImpl(NULL, NULL, *xmlDocumentRoot);
 
-        xmlRootNode = new CXMLNodeImpl(NULL, NULL, *xmlRoot);
+            xmlRootNode = CXMLImpl::BuildNode(xmlBaseNode, xmlDocumentRoot);
 
-        xmlChild = 0;
-        while (xmlChild = xmlRoot->IterateChildren(xmlChild))
-        {
-            xmlChildNode = new CXMLNodeImpl(NULL, xmlRootNode, *xmlChild->ToElement());
+            return xmlRootNode;
         }
-
-        return xmlRootNode;
+        else
+            return NULL;
     }
     else
     {
         return NULL;
     }
 }
 
+CXMLNode* CXMLImpl::BuildNode(CXMLNodeImpl* xmlParent, TiXmlNode* xmlNode)
+{
+    TiXmlNode       *xmlChild;
+    TiXmlElement    *xmlChildElement;
+    CXMLNodeImpl    *xmlChildNode;
+
+    xmlChild = 0;
+    while (xmlChild = xmlNode->IterateChildren(xmlChild))
+    {
+        xmlChildElement = xmlChild->ToElement();
+
+        xmlChildNode = new CXMLNodeImpl(NULL, xmlParent, *xmlChildElement);
+
+        CXMLImpl::BuildNode(xmlChildNode, xmlChildElement);
+    }
+
+    return xmlParent;
+}
+
 CXMLNode* CXMLImpl::CreateDummyNode()
 {
     CXMLNode* xmlNode = new CXMLNodeImpl(NULL, NULL, *new TiXmlElement("dummy_storage"));

Shared/XML/CXMLImpl.h

@@ -21,6 +21,7 @@ class CXMLImpl : public CXML
 
     CXMLFile* CreateXML(const char* szFilename, bool bUseIDs, bool bReadOnly);
     CXMLNode* ParseString(const char* strXmlContent);
+    CXMLNode* BuildNode(CXMLNodeImpl* xmlParent, TiXmlNode* xmlNode);
     void      DeleteXML(CXMLFile* pFile);
 
     CXMLNode* CreateDummyNode();

Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp

@@ -230,11 +230,14 @@ int CLuaXMLDefs::xmlLoadString(lua_State* luaVM)
         if (pLuaMain)
         {
             CXMLNode* rootNode = pLuaMain->ParseString(strXmlContent);
-            if (rootNode->IsValid())
+
+            if (rootNode && rootNode->IsValid())
             {
                 lua_pushxmlnode(luaVM, rootNode);
                 return 1;
             }
+            else
+                m_pScriptDebugging->LogCustom(luaVM, "Unable to load XML string");
         }
     }
     else