Fixed problems with loading XML files containing Windows newlines

By using xmlParseFile instead of xmlParseMemory, the system-dependent
newlines should be handled automatically.

The .tmx.gz files should still be supported, but instead of manually
decompressing them the xmlParseFile function should take care of that.

It also fixes the leaking of XML documents in both the SkillManager as
well as the PermissionManager, since they now rely on XML::Document,
which cleans up automatically.

Reviewed-by: Stefan Dombrowski

2 files changed, 16 insertions, 77 deletions

diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp
index 80d0a107..462105f2 100644
--- a/src/game-server/mapreader.cpp
+++ b/src/game-server/mapreader.cpp
@@ -20,7 +20,6 @@
 
 #include "game-server/mapreader.h"
 
-#include "common/resourcemanager.h"
 #include "game-server/map.h"
 #include "game-server/mapcomposite.h"
 #include "game-server/mapmanager.h"
@@ -40,58 +39,18 @@ static std::vector< int > tilesetFirstGids;
 
 bool MapReader::readMap(const std::string &filename, MapComposite *composite)
 {
-    int fileSize;
-    char *buffer = ResourceManager::loadFile(filename, fileSize);
-
-    if (buffer == NULL)
-    {
-        LOG_ERROR("Error: Map file not found (" << filename.c_str() << ")");
-        return false;
-    }
-
-    xmlDocPtr doc = NULL;
-
-    int l = filename.length();
-    if (l > 3 && filename.substr(l - 3) == ".gz")
-    {
-        // Inflate the gzipped map data.
-        char *inflated;
-        unsigned inflatedSize = 0;
-        bool ret = inflateMemory(buffer, fileSize, inflated, inflatedSize);
-        free(buffer);
-        buffer = ret ? inflated : NULL;
-        fileSize = inflatedSize;
-    }
-
-    if (buffer)
-    {
-        // Parse the XML document.
-        doc = xmlParseMemory(buffer, fileSize);
-        free(buffer);
-    }
-
-    if (!doc)
-    {
-        LOG_ERROR("Error while parsing map file '" << filename << "'!");
-        return false;
-    }
-
-    Map *map = NULL;
-    xmlNodePtr node = xmlDocGetRootElement(doc);
-
-    std::vector<Thing *> things;
+    XML::Document doc(filename);
+    xmlNodePtr rootNode = doc.rootNode();
 
     // Parse the inflated map data.
-    if (node && xmlStrEqual(node->name, BAD_CAST "map"))
-    {
-        map = MapReader::readMap(node, filename, composite, things);
-    }
-    else
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "map"))
     {
         LOG_ERROR("Error: Not a map file (" << filename << ")!");
+        return false;
     }
 
-    xmlFreeDoc(doc);
+    std::vector<Thing *> things;
+    Map *map = readMap(rootNode, filename, composite, things);
 
     if (map)
     {
diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp
index d15219a4..75f5f53c 100644
--- a/src/game-server/skillmanager.cpp
+++ b/src/game-server/skillmanager.cpp
@@ -20,7 +20,6 @@
 
 #include "game-server/skillmanager.h"
 
-#include "common/resourcemanager.h"
 #include "utils/string.h"   // for the toUpper function
 #include "utils/logger.h"
 #include "utils/xml.h"
@@ -45,42 +44,23 @@ void SkillManager::reload()
     skillMap["KNIFE"] = 101;
     */
 
-    int size;
-    char *data = ResourceManager::loadFile(skillReferenceFile, size);
+    XML::Document doc(skillReferenceFile);
+    xmlNodePtr rootNode = doc.rootNode();
 
-    std::string absPathFile = ResourceManager::resolve(skillReferenceFile);
-
-    if (!data)
-    {
-        LOG_ERROR("Skill Manager: Could not find " << skillReferenceFile << "!");
-        free(data);
-        return;
-    }
-
-    xmlDocPtr doc = xmlParseMemory(data, size);
-    free(data);
-
-    if (!doc)
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skills"))
     {
-        LOG_ERROR("Skill Manager: Error while parsing skill database ("
-                  << absPathFile << ")!");
-        return;
-    }
-
-    xmlNodePtr node = xmlDocGetRootElement(doc);
-    if (!node || !xmlStrEqual(node->name, BAD_CAST "skills"))
-    {
-        LOG_ERROR("Skill Manager: " << absPathFile
+        LOG_ERROR("Skill Manager: " << skillReferenceFile
                   << " is not a valid database file!");
-        xmlFreeDoc(doc);
         return;
     }
 
-    LOG_INFO("Loading skill reference: " << absPathFile);
+    LOG_INFO("Loading skill reference: " << skillReferenceFile);
 
-    for_each_xml_child_node(setnode, node)
+    for_each_xml_child_node(setnode, rootNode)
     {
-        if (xmlStrEqual(setnode->name, BAD_CAST "set"))
+        if (!xmlStrEqual(setnode->name, BAD_CAST "set"))
+            continue;
+
         // we don't care about sets server-sided (yet?)
         for_each_xml_child_node(skillnode, setnode)
         {
@@ -158,7 +138,7 @@ void SkillManager::reload()
                  "Skill map loading. Defaults will fall back to id 0.");
 
     LOG_INFO("Loaded " << skillMap.size() << " skill references from "
-             << absPathFile);
+             << skillReferenceFile);
 }
 
 int SkillManager::getIdFromString(const std::string &name)