fix emergemanager memory leaks

sapier · kwolekr · commit 7d002b60ff3d · 2013-04-09T02:34:11.000-04:00
diff --git 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
@@ -2494,6 +2494,8 @@ ServerMap::~ServerMap()
 		delete chunk;
 	}
 #endif
+
+	delete m_mgparams;
 }
 
 bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)

Original file line number	Diff line number	Diff line change
`@@ -2494,6 +2494,8 @@ ServerMap::~ServerMap()`
`2494`	`2494`	`delete chunk;`
`2495`	`2495`	`}`
`2496`	`2496`	`#endif`
	`2497`	`+`
	`2498`	`+ delete m_mgparams;`
`2497`	`2499`	`}`
`2498`	`2500`
`2499`	`2501`	`bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)`