fix various memory leaks

sapier · kwolekr · commit 04c3b17c780f · 2013-04-09T02:23:07.000-04:00
diff --git a/src/mesh.cpp b/src/mesh.cpp
@@ -246,6 +246,8 @@ static scene::IAnimatedMesh* extrudeARGB(u32 twidth, u32 theight, u8 *data)
 		}
 	}
 
+	delete[] solidity;
+
 	// Add to mesh
 	scene::SMesh *mesh = new scene::SMesh();
 	mesh->addMeshBuffer(buf);
diff --git a/src/server.cpp b/src/server.cpp
@@ -904,6 +904,9 @@ Server::~Server()
 	*/
 	stop();
 
+	//shutdown all emerge threads first!
+	delete m_emerge;
+
 	/*
 		Delete clients
 	*/
@@ -923,7 +926,6 @@ Server::~Server()
 	// Delete things in the reverse order of creation
 	delete m_env;
 	delete m_rollback;
-	delete m_emerge;
 	delete m_event;
 	delete m_itemdef;
 	delete m_nodedef;
diff --git a/src/test.cpp b/src/test.cpp
@@ -1781,5 +1781,7 @@ void run_tests()
 		errorstream<<"run_tests() aborting."<<std::endl;
 		abort();
 	}
+	delete idef;
+	delete ndef;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,8 @@ static scene::IAnimatedMesh* extrudeARGB(u32 twidth, u32 theight, u8 *data)`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
	`249`	`+ delete[] solidity;`
	`250`	`+`
`249`	`251`	`// Add to mesh`
`250`	`252`	`scene::SMesh *mesh = new scene::SMesh();`
`251`	`253`	`mesh->addMeshBuffer(buf);`
Original file line number	Diff line number	Diff line change
`@@ -1781,5 +1781,7 @@ void run_tests()`
`1781`	`1781`	`errorstream<<"run_tests() aborting."<<std::endl;`
`1782`	`1782`	`abort();`
`1783`	`1783`	`}`
	`1784`	`+ delete idef;`
	`1785`	`+ delete ndef;`
`1784`	`1786`	`}`
`1785`	`1787`