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

[Crash] Check mob pointer before trying to remove it (#4230)

Browse Source
This commit is contained in:
Chris Miles 2024-04-01 17:09:57 -05:00 committed by GitHub
parent e64f03fcc0
commit 3a5381d38a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/entity.cpp
View File

@ -2675,6 +2675,10 @@ void EntityList::RemoveAllMobs()
{ {
auto it = mob_list.begin(); auto it = mob_list.begin();
while (it != mob_list.end()) { while (it != mob_list.end()) {
if (!it->second) {
++it;
continue;
}
safe_delete(it->second); safe_delete(it->second);
free_ids.push(it->first); free_ids.push(it->first);
it = mob_list.erase(it); it = mob_list.erase(it);
@ -2812,6 +2816,9 @@ bool EntityList::RemoveMob(uint16 delete_id)
auto it = mob_list.find(delete_id); auto it = mob_list.find(delete_id);
if (it != mob_list.end()) { if (it != mob_list.end()) {
if (!it->second) {
return false;
}
if (npc_list.count(delete_id)) { if (npc_list.count(delete_id)) {
entity_list.RemoveNPC(delete_id); entity_list.RemoveNPC(delete_id);
} }