Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Protect against stack overflows in spell override handling

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/723e638a84d2aebe8a41fc39ba94f1a04138797e)
This commit is contained in:
Hondacrx
2024-11-10 14:16:58 -05:00
parent b34ef7c6f7
commit daea912bdb
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Spells.cs
+10 -6
View File
@@ -274,20 +274,23 @@ namespace Game.Entities
return false;
}
public override SpellInfo GetCastSpellInfo(SpellInfo spellInfo, TriggerCastFlags triggerFlag)
public override SpellInfo GetCastSpellInfo(SpellInfo spellInfo, TriggerCastFlags triggerFlag, GetCastSpellInfoContext context)
{
var overrides = m_overrideSpells.LookupByKey(spellInfo.Id);
if (!overrides.Empty())
{
foreach (uint spellId in overrides)
{
SpellInfo newInfo = Global.SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID());
if (newInfo != null)
return GetCastSpellInfo(newInfo, triggerFlag);
if (context.AddSpell(spellId))
{
SpellInfo newInfo = Global.SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID());
if (newInfo != null)
return GetCastSpellInfo(newInfo, triggerFlag, context);
}
}
}
return base.GetCastSpellInfo(spellInfo, triggerFlag);
return base.GetCastSpellInfo(spellInfo, triggerFlag, context);
}
public void SetOverrideSpellsId(uint overrideSpellsId) { SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.OverrideSpellsID), overrideSpellsId); }
@@ -3879,7 +3882,8 @@ namespace Game.Entities
}
// Check possible spell cast overrides
spellInfo = castingUnit.GetCastSpellInfo(spellInfo, triggerFlag);
GetCastSpellInfoContext overrideContext = new();
spellInfo = castingUnit.GetCastSpellInfo(spellInfo, triggerFlag, overrideContext);
if (spellInfo.IsPassive())
{
CancelPendingCastRequest();