From 7d002b60ff3d672d141e0de65702c8af5b60f83a Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Sun, 7 Apr 2013 21:01:19 +0200
Subject: fix emergemanager memory leaks

---
 src/emerge.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/emerge.cpp')

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 499aaf291..9d3f94d48 100644
--- 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;
 }
 
 
-- 
cgit v1.2.3


From ce901f4c4ca97dee5ab0a3a0d3e14cf7f1cf0154 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Fri, 12 Apr 2013 17:20:05 -0400
Subject: Fix double free, null texture drop

---
 src/emerge.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/emerge.cpp')

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 9d3f94d48..049b3cc12 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -97,9 +97,6 @@ EmergeManager::~EmergeManager() {
 		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++)
-- 
cgit v1.2.3