From 86593798a9d9c6cd99d9365f816ecfd679e1a912 Mon Sep 17 00:00:00 2001 From: Uleat Date: Sun, 1 Dec 2019 17:59:38 -0500 Subject: [PATCH] Added safety check for zone dereference in ServerOP_ReloadRules handler --- zone/worldserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 4f7e35ace..a5180963d 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -1806,8 +1806,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) worldserver.SendEmoteMessage( 0, 0, 100, 15, "Rules reloaded for Zone: '%s' Instance ID: %u", - zone->GetLongName(), - zone->GetInstanceID() + (zone ? zone->GetLongName() : StringFormat("Null zone pointer [pid]:[%i]", getpid()).c_str()), + (zone ? zone->GetInstanceID() : 0xFFFFFFFFF) ); RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true); break;