Merge pull request #1282 from EQEmu/bug_fix/spawngroup_leak_repop

[Leak] Port SpawnGroup stuff to unique_ptr to fix leak

zone/spawngroup.cpp

@@ -78,12 +78,9 @@ uint32 SpawnGroup::GetNPCType(uint16 in_filter)
 		return (0);
 	}
 
-	std::list<SpawnEntry *>::iterator cur, end;
+	std::list<SpawnEntry *> possible;
-	std::list<SpawnEntry *>           possible;
+	for (auto &it : list_) {
-	cur = list_.begin();
+		auto se = it.get();
-	end = list_.end();
-	for (; cur != end; ++cur) {
-		SpawnEntry *se = *cur;
 
 		if (!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit)) {
 			continue;
@@ -95,6 +92,7 @@ uint32 SpawnGroup::GetNPCType(uint16 in_filter)
 		totalchance += se->chance;
 		possible.push_back(se);
 	}
+
 	if (totalchance == 0) {
 		return 0;
 	}
@@ -102,10 +100,7 @@ uint32 SpawnGroup::GetNPCType(uint16 in_filter)
 	int32 roll = 0;
 	roll = zone->random.Int(0, totalchance - 1);
 
-	cur = possible.begin();
+	for (auto se : possible) {
-	end = possible.end();
-	for (; cur != end; ++cur) {
-		SpawnEntry *se = *cur;
 		if (roll < se->chance) {
 			npcType = se->NPCType;
 			break;
@@ -117,42 +112,28 @@ uint32 SpawnGroup::GetNPCType(uint16 in_filter)
 	return npcType;
 }
 
-void SpawnGroup::AddSpawnEntry(SpawnEntry *newEntry)
+void SpawnGroup::AddSpawnEntry(std::unique_ptr<SpawnEntry> &newEntry)
 {
-	list_.push_back(newEntry);
+	list_.push_back(std::move(newEntry));
 }
 
 SpawnGroup::~SpawnGroup()
 {
-	std::list<SpawnEntry *>::iterator cur, end;
-	cur = list_.begin();
-	end = list_.end();
-	for (; cur != end; ++cur) {
-		SpawnEntry *tmp = *cur;
-		safe_delete(tmp);
-	}
 	list_.clear();
 }
 
 SpawnGroupList::~SpawnGroupList()
 {
-	std::map<uint32, SpawnGroup *>::iterator cur, end;
-	cur = m_spawn_groups.begin();
-	end = m_spawn_groups.end();
-	for (; cur != end; ++cur) {
-		SpawnGroup *tmp = cur->second;
-		safe_delete(tmp);
-	}
 	m_spawn_groups.clear();
 }
 
-void SpawnGroupList::AddSpawnGroup(SpawnGroup *new_group)
+void SpawnGroupList::AddSpawnGroup(std::unique_ptr<SpawnGroup> &new_group)
 {
 	if (new_group == nullptr) {
 		return;
 	}
 
-	m_spawn_groups[new_group->id] = new_group;
+	m_spawn_groups[new_group->id] = std::move(new_group);
 }
 
 SpawnGroup *SpawnGroupList::GetSpawnGroup(uint32 in_id)
@@ -161,7 +142,7 @@ SpawnGroup *SpawnGroupList::GetSpawnGroup(uint32 in_id)
 		return nullptr;
 	}
 
-	return (m_spawn_groups[in_id]);
+	return (m_spawn_groups[in_id].get());
 }
 
 bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id)
@@ -224,7 +205,7 @@ bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnG
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto new_spawn_group = new SpawnGroup(
+		auto new_spawn_group = std::make_unique<SpawnGroup>(
 			atoi(row[0]),
 			row[1],
 			atoi(row[2]),
@@ -272,7 +253,7 @@ bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnG
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto new_spawn_entry = new SpawnEntry(
+		auto new_spawn_entry = std::make_unique<SpawnEntry>(
 			atoi(row[1]),
 			atoi(row[2]),
 			atoi(row[3]),
@@ -282,7 +263,6 @@ bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnG
 		SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
 
 		if (!spawn_group) {
-			safe_delete(new_spawn_entry);
 			continue;
 		}
 
@@ -337,7 +317,7 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList *spawn
 			row[3]
 		);
 
-		auto new_spawn_group = new SpawnGroup(
+		auto new_spawn_group = std::make_unique<SpawnGroup>(
 			atoi(row[0]),
 			row[1],
 			atoi(row[2]),
@@ -380,7 +360,7 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList *spawn
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto new_spawn_entry = new SpawnEntry(
+		auto new_spawn_entry = std::make_unique<SpawnEntry>(
 			atoi(row[1]),
 			atoi(row[2]),
 			atoi(row[3]),
@@ -398,7 +378,6 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList *spawn
 
 		SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
 		if (!spawn_group) {
-			safe_delete(new_spawn_entry);
 			continue;
 		}
 

zone/spawngroup.h

@@ -22,6 +22,7 @@
 
 #include <map>
 #include <list>
+#include <memory>
 
 class SpawnEntry {
 public:
@@ -55,7 +56,7 @@ public:
 
 	~SpawnGroup();
 	uint32 GetNPCType(uint16 condition_value_filter=1);
-	void AddSpawnEntry(SpawnEntry *newEntry);
+	void AddSpawnEntry(std::unique_ptr<SpawnEntry> &newEntry);
 	uint32 id;
 	bool wp_spawns;			// if true, spawn NPCs at a random waypoint location (if spawnpoint has a grid) instead of the spawnpoint's loc
 	float  roamdist;
@@ -66,7 +67,7 @@ public:
 	uint32 despawn_timer;
 private:
 	char name_[120];
-	std::list<SpawnEntry *> list_;
+	std::list<std::unique_ptr<SpawnEntry>> list_;
 	uint8 group_spawn_limit; //max # of this entry which can be spawned by this group
 };
 
@@ -75,14 +76,13 @@ public:
 	SpawnGroupList() {}
 	~SpawnGroupList();
 
-	void AddSpawnGroup(SpawnGroup *new_group);
+	void AddSpawnGroup(std::unique_ptr<SpawnGroup> &new_group);
 	SpawnGroup *GetSpawnGroup(uint32 id);
 	bool RemoveSpawnGroup(uint32 in_id);
 	void ClearSpawnGroups();
 	void ReloadSpawnGroups();
 private:
-	//LinkedList<SpawnGroup*> list_;
+	std::map<uint32, std::unique_ptr<SpawnGroup>> m_spawn_groups;
-	std::map<uint32, SpawnGroup *> m_spawn_groups;
 };
 
 #endif