araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 11:43:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: properly validate stored targets when using SmartTrigger and fix a related crash

Browse Source 
(cherry picked from commit 866074b689)
This commit is contained in:
ariel-
2017-06-04 16:43:36 -03:00
committed by Carbenium
parent 87c5ddeab6
commit 960bfcabc3
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -1871,7 +1871,14 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
}
case SMART_ACTION_SEND_TARGET_TO_TARGET:
{
ObjectVector const* storedTargets = GetStoredTargetVector(e.action.sendTargetToTarget.id);
WorldObject* ref = GetBaseObject();
if (!ref)
ref = unit;
if (!ref)
break;
ObjectVector const* storedTargets = GetStoredTargetVector(e.action.sendTargetToTarget.id, *ref);
if (!storedTargets)
break;
@@ -2613,8 +2620,13 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e,
}
case SMART_TARGET_STORED:
{
if (ObjectVector const* stored = GetStoredTargetVector(e.target.stored.id))
targets.assign(stored->begin(), stored->end());
WorldObject* ref = GetBaseObject();
if (!ref)
ref = scriptTrigger;
if (ref)
if (ObjectVector const* stored = GetStoredTargetVector(e.target.stored.id, *ref))
targets.assign(stored->begin(), stored->end());
break;
}
case SMART_TARGET_CLOSEST_CREATURE: