From d9f96a63e2313bdb081e98d6adbe66ca759a55f8 Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Tue, 5 May 2026 23:59:32 -0500 Subject: [PATCH] fix(Core/RBAC): guard against null RBACData in .rbac account commands (#25724) Co-authored-by: blinkysc --- src/server/scripts/Commands/cs_rbac.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Commands/cs_rbac.cpp b/src/server/scripts/Commands/cs_rbac.cpp index 7d80a33a7a..21adb9dfeb 100644 --- a/src/server/scripts/Commands/cs_rbac.cpp +++ b/src/server/scripts/Commands/cs_rbac.cpp @@ -74,8 +74,10 @@ public: static RBACCommandData GetRBACData(uint32 accountId, std::string const& accountName) { + // session->GetRBACData() can be null after World::ReloadRBAC() if (WorldSession* session = sWorldSessionMgr->FindSession(accountId)) - return { session->GetRBACData(), false }; + if (rbac::RBACData* sessionRbac = session->GetRBACData()) + return { sessionRbac, false }; rbac::RBACData* rbac = new rbac::RBACData(accountId, accountName, realm.Id.Realm, AccountMgr::GetSecurity(accountId, realm.Id.Realm)); rbac->LoadFromDB();