pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 16:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix] Repair a LoadNPCEmote MemoryLeak (#4586)

Browse Source
This commit is contained in:
Mitch Freeman 2025-01-06 01:44:51 -04:00 committed by GitHub
parent 8a7d5e72cb
commit 20ff325013
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/zone.cpp
View File

@ -1100,7 +1100,12 @@ Zone::~Zone() {
if (worldserver.Connected()) { if (worldserver.Connected()) {
worldserver.SetZoneData(0); worldserver.SetZoneData(0);
} }
for (auto &e: npc_emote_list) {
safe_delete(e);
}
npc_emote_list.clear(); npc_emote_list.clear();
zone_point_list.Clear(); zone_point_list.Clear();
entity_list.Clear(); entity_list.Clear();
parse->ReloadQuests(); parse->ReloadQuests();
@ -1257,7 +1262,6 @@ void Zone::ReloadStaticData() {
LoadVeteranRewards(); LoadVeteranRewards();
LoadAlternateCurrencies(); LoadAlternateCurrencies();
npc_emote_list.clear();
LoadNPCEmotes(&npc_emote_list); LoadNPCEmotes(&npc_emote_list);
//load the zone config file. //load the zone config file.
@ -2575,6 +2579,10 @@ void Zone::DoAdventureActions()
void Zone::LoadNPCEmotes(std::vector<NPC_Emote_Struct*>* v) void Zone::LoadNPCEmotes(std::vector<NPC_Emote_Struct*>* v)
{ {
for (auto &e: *v) {
safe_delete(e);
}
v->clear(); v->clear();
const auto& l = NpcEmotesRepository::All(content_db); const auto& l = NpcEmotesRepository::All(content_db);