Merged most of the changes in biggeruniverse's second memory cleanup patch.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index 7d9c5ef5..caa26f5b 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -42,12 +42,16 @@ ItemManager::ItemManager()
     xmlDocPtr doc = xmlParseMemory(data, size);
     free(data);
 
-    if (doc) {
+    if (doc)
+    {
         xmlNodePtr node = xmlDocGetRootElement(doc);
 
-        if (!node || !xmlStrEqual(node->name, BAD_CAST "items")) {
+        if (!node || !xmlStrEqual(node->name, BAD_CAST "items"))
+        {
             logger->error("items.xml is not a valid database file!");
-        } else {
+        }
+        else
+        {
             for (node = node->xmlChildrenNode; node != NULL; node = node->next)
             {
                 if (xmlStrEqual(node->name, BAD_CAST "item"))
@@ -112,6 +116,14 @@ ItemManager::ItemManager()
 
 ItemManager::~ItemManager()
 {
+    std::map<int, ItemInfo*>::iterator i;
+    for (i = db.begin(); i != db.end(); i++)
+    {
+        delete (*i).second;
+    }
+    db.clear();
+
+    delete unknown;
 }
 
 ItemInfo *ItemManager::getItemInfo(int id)