fix emergemanager memory leaks

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 499aaf291916d962818f1bccd50967e0d957d33b..9d3f94d48428f5d9a97a86af268b7c0783d5592c 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -96,9 +96,23 @@ EmergeManager::~EmergeManager() {
                delete emergethread[i];
                delete mapgen[i];
        }
+       emergethread.clear();
+
+       for (unsigned int i = 0; i < mapgen.size(); i++)
+               delete mapgen[i];
+       mapgen.clear();
+
+       for (unsigned int i = 0; i < ores.size(); i++)
+               delete ores[i];
+       ores.clear();
        
+       for (std::map<std::string, MapgenFactory *>::iterator iter = mglist.begin();
+                       iter != mglist.end(); iter ++) {
+               delete iter->second;
+       }
+       mglist.clear();
+
        delete biomedef;
-       delete params;
 }
 
 

diff --git a/src/map.cpp b/src/map.cpp
index a8201f3ee7cb0456c050e187e4df231837b8a9a6..c4884a45a12cdc3652ac2da5af01ca6f8943ad80 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2494,6 +2494,8 @@ ServerMap::~ServerMap()
                delete chunk;
        }
 #endif
+
+       delete m_mgparams;
 }
 
 bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)