Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Auras: Fixed possible iterator invalidation crashes caused by calling UpdateTargetMap inside loops iterating m_appliedAuras

Browse Source
This commit is contained in:
Shauren authored and Ovahlord committed 2023-01-19 17:30:41 +01:00
1 parent 5101026143
commit f97d336d82
2 files changed
+12 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/Unit/Unit.cpp
+6 -2
View File
@@ -3870,7 +3870,8 @@ void Unit::RemoveMovementImpairingAuras(bool withRoot)
void Unit::RemoveAurasWithMechanic(uint32 mechanicMaskToRemove, AuraRemoveFlags removeMode, uint32 exceptSpellId, bool withEffectMechanics)
{
RemoveAppliedAuras([=](AuraApplication const* aurApp)
std::vector<Aura*> aurasToUpdateTargets;
RemoveAppliedAuras([=, &aurasToUpdateTargets](AuraApplication const* aurApp)
{
Aura* aura = aurApp->GetBase();
if (exceptSpellId && aura->GetId() == exceptSpellId)
@@ -3885,9 +3886,12 @@ void Unit::RemoveAurasWithMechanic(uint32 mechanicMaskToRemove, AuraRemoveFlags
return true;
// effect mechanic matches required mask for removal - don't remove, only update targets
aura->UpdateTargetMap(aura->GetCaster());
aurasToUpdateTargets.push_back(aura);
return false;
}, removeMode);
for (Aura* aura : aurasToUpdateTargets)
aura->UpdateTargetMap(aura->GetCaster());
}
void Unit::RemoveAurasByShapeShift()
src/server/game/Spells/SpellInfo.cpp
+6 -2
View File
@@ -3106,15 +3106,19 @@ void SpellInfo::ApplyAllSpellImmunitiesTo(Unit* target, uint8 effIndex, bool app
target->RemoveAurasWithMechanic(mechanicImmunity, AuraRemoveFlags::ByDefault, Id);
else
{
target->RemoveAppliedAuras([mechanicImmunity](AuraApplication const* aurApp)
std::vector<Aura*> aurasToUpdateTargets;
target->RemoveAppliedAuras([mechanicImmunity, &aurasToUpdateTargets](AuraApplication const* aurApp)
{
Aura* aura = aurApp->GetBase();
if (aura->GetSpellInfo()->GetAllEffectsMechanicMask() & mechanicImmunity)
aura->UpdateTargetMap(aura->GetCaster());
aurasToUpdateTargets.push_back(aura);
// only update targets, don't remove anything
return false;
});
for (Aura* aura : aurasToUpdateTargets)
aura->UpdateTargetMap(aura->GetCaster());
}
}
}