Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed possible use after free with deleted focusObject (#30062)

Browse Source 
* Core/Spells: Fixed possible use after free with deleted focusObject
This commit is contained in:
Gildor
2024-07-04 22:51:25 +02:00
committed by GitHub
parent 8130024497
commit 93ab97a37c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Spells/Spell.cpp
View File

@@ -5426,7 +5426,9 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
if (m_spellInfo->RequiresSpellFocus)
{
focusObject = SearchSpellFocus();
if (!focusObject)
if (focusObject)
m_focusObjectGUID = focusObject->GetGUID();
else
return SPELL_FAILED_REQUIRES_SPELL_FOCUS;
}
@@ -7284,6 +7286,9 @@ bool Spell::UpdatePointers()
m_originalCaster = nullptr;
}
if (m_focusObjectGUID)
focusObject = ObjectAccessor::GetGameObject(*m_caster, m_focusObjectGUID);
if (m_castItemGUID && m_caster->GetTypeId() == TYPEID_PLAYER)
{
m_CastItem = m_caster->ToPlayer()->GetItemByGuid(m_castItemGUID);

1
src/server/game/Spells/Spell.h
View File

@@ -530,6 +530,7 @@ class TC_GAME_API Spell
DynObjAura* _dynObjAura;
// -------------------------------------------
ObjectGuid m_focusObjectGUID;
GameObject* focusObject;
// Damage and healing in effects need just calculate