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/Unit/Unit.Spells.cs
+26 -4
View File
@@ -944,14 +944,14 @@ namespace Game.Entities
spell.Finish(result);
}
public virtual SpellInfo GetCastSpellInfo(SpellInfo spellInfo, TriggerCastFlags triggerFlag)
public virtual SpellInfo GetCastSpellInfo(SpellInfo spellInfo, TriggerCastFlags triggerFlag, GetCastSpellInfoContext context)
{
SpellInfo findMatchingAuraEffectIn(AuraType type)
{
foreach (AuraEffect auraEffect in GetAuraEffectsByType(type))
{
bool matches = auraEffect.GetMiscValue() != 0 ? auraEffect.GetMiscValue() == spellInfo.Id : auraEffect.IsAffectingSpell(spellInfo);
if (matches)
if (matches && context.AddSpell((uint)auraEffect.GetAmount()))
{
SpellInfo info = Global.SpellMgr.GetSpellInfo((uint)auraEffect.GetAmount(), GetMap().GetDifficultyID());
if (info != null)
@@ -979,14 +979,14 @@ namespace Game.Entities
if (newInfo != null)
{
triggerFlag &= ~TriggerCastFlags.IgnoreCastTime;
return GetCastSpellInfo(newInfo, triggerFlag);
return GetCastSpellInfo(newInfo, triggerFlag, context);
}
newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpellsTriggered);
if (newInfo != null)
{
triggerFlag |= TriggerCastFlags.IgnoreCastTime;
return GetCastSpellInfo(newInfo, triggerFlag);
return GetCastSpellInfo(newInfo, triggerFlag, context);
}
return spellInfo;
@@ -4602,4 +4602,26 @@ namespace Game.Entities
public void SetVisibleAuraUpdate(AuraApplication aurApp) { m_visibleAurasToUpdate.Add(aurApp); }
public void RemoveVisibleAuraUpdate(AuraApplication aurApp) { m_visibleAurasToUpdate.Remove(aurApp); }
}
public class GetCastSpellInfoContext
{
uint[] VisitedSpells = new uint[5];
public bool AddSpell(uint spellId)
{
if (VisitedSpells.Contains(spellId))
return false; // already exists
for (int i = 0; i < VisitedSpells.Length; ++i)
{
if (VisitedSpells[i] != 0u)
continue;
VisitedSpells[i] = spellId;
return true;
}
return false;
}
}
}