nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-31 01:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core): check spell info and prevent crash (#6454)

Browse Source
This commit is contained in:
Francesco Borzì
2021-06-20 19:52:44 +02:00
committed by GitHub
parent 08e205d44b
commit 36a6d04156
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Entities/Player/Player.cpp
View File

@@ -4417,7 +4417,11 @@ void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns)
{
next = itr;
++next;
SpellInfo const* spellInfo = sSpellMgr->AssertSpellInfo(itr->first);
SpellInfo const* spellInfo = sSpellMgr->CheckSpellInfo(itr->first);
if (!spellInfo)
{
continue;
}
if (spellInfo->HasAttribute(SPELL_ATTR4_IGNORE_DEFAULT_ARENA_RESTRICTIONS))
RemoveSpellCooldown(itr->first, true);

17
src/server/game/Spells/SpellMgr.h
View File

@@ -10,6 +10,7 @@
// For static or at-server-startup loaded spell data
#include "Common.h"
#include "Log.h"
#include "SharedDefines.h"
#include "Unit.h"
@@ -692,6 +693,22 @@ public:
ASSERT(spellInfo);
return spellInfo;
}
// use this instead of AssertSpellInfo to have the problem logged instead of crashing the server
SpellInfo const* CheckSpellInfo(uint32 spellId) const
{
if (spellId >= GetSpellInfoStoreSize())
{
LOG_ERROR("server", "spellId %u is not lower than GetSpellInfoStoreSize() (%u)", spellId, GetSpellInfoStoreSize());
return nullptr;
}
SpellInfo const* spellInfo = mSpellInfoMap[spellId];
if (!spellInfo)
{
LOG_ERROR("server", "spellId %u has invalid spellInfo", spellId);
return nullptr;
}
return spellInfo;
}
[[nodiscard]] uint32 GetSpellInfoStoreSize() const { return mSpellInfoMap.size(); }
// Talent Additional Set