From 9d647e2bdecbfc587f7bd13bdcb3879397762131 Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 9 Feb 2023 12:55:45 +0100 Subject: [PATCH] failing nullptr check should abort the function. --- src/world/Manager/FreeCompanyMgr.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/world/Manager/FreeCompanyMgr.cpp b/src/world/Manager/FreeCompanyMgr.cpp index 96457923..601e1c16 100644 --- a/src/world/Manager/FreeCompanyMgr.cpp +++ b/src/world/Manager/FreeCompanyMgr.cpp @@ -179,7 +179,10 @@ void FreeCompanyMgr::sendFcInviteList( Entity::Player& player ) // fill master character data auto masterCharacter = server.getPlayer( fc->getMasterId() ); if( !masterCharacter ) + { Logger::error( "FreeCompanyMgr: Unable to look up master character#{}!", fc->getMasterId() ); + return; + } inviteListPacket->data().MasterCharacter.GrandCompanyID = masterCharacter->getGc(); inviteListPacket->data().MasterCharacter.CharacterID = masterCharacter->getCharacterId();