Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: Fixed use after free in WaypointMovementGenerator

Browse Source 
Closes #29274
This commit is contained in:
Shauren
2023-08-22 19:34:21 +02:00
parent 1bea4aab45
commit 8d43d2bafc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
View File

@@ -240,13 +240,16 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* owner)
return;
ASSERT(_currentNode < _path->nodes.size(), "WaypointMovementGenerator::OnArrived: tried to reference a node id (%u) which is not included in path (%u)", _currentNode, _path->id);
WaypointNode const &waypoint = _path->nodes.at(_currentNode);
WaypointNode const& waypoint = _path->nodes[_currentNode];
if (waypoint.delay)
{
owner->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
_nextMoveTime.Reset(waypoint.delay);
}
// scripts can invalidate current path, store what we need
uint32 waypointId = waypoint.id;
uint32 pathId = _path->id;
if (waypoint.eventId && urand(0, 99) < waypoint.eventChance)
{
TC_LOG_DEBUG("maps.script", "Creature movement start script {} at point {} for {}.", waypoint.eventId, _currentNode, owner->GetGUID().ToString());
@@ -258,10 +261,10 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* owner)
if (CreatureAI* AI = owner->AI())
{
AI->MovementInform(WAYPOINT_MOTION_TYPE, _currentNode);
AI->WaypointReached(waypoint.id, _path->id);
AI->WaypointReached(waypointId, pathId);
}
owner->UpdateCurrentWaypointInfo(waypoint.id, _path->id);
owner->UpdateCurrentWaypointInfo(waypointId, pathId);
}
void WaypointMovementGenerator<Creature>::StartMove(Creature* owner, bool relaunch/* = false*/)