Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Unit motion - Check the return value of ComputeGoal and handle failure cases

Browse Source 
As reported by @Freagarach on #5496, there can be broken behaviour as
UnitMotion::PathResult may call RequestLongPath with an uninitialised
path goal when ComputeGoal fails.

To fix this, check the return value everywhere and react accordingly in
case of failure.

Fixes #5496

Differential Revision: https://code.wildfiregames.com/D2063
This was SVN commit r22458.
This commit is contained in:
wraitii 2019-07-12 16:16:13 +00:00
parent a573460c65
commit dcf5bad7fd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/simulation2/components/CCmpUnitMotion.cpp
View File

@ -674,8 +674,8 @@ void CCmpUnitMotion::PathResult(u32 ticket, const WaypointPath& path)
}
PathGoal goal;
ComputeGoal(goal, m_MoveRequest);
RequestLongPath(pos, goal);
if (ComputeGoal(goal, m_MoveRequest))
RequestLongPath(pos, goal);
return;
}
@ -748,8 +748,8 @@ void CCmpUnitMotion::Move(fixed dt)
if (PathingUpdateNeeded(pos))
{
PathGoal goal;
ComputeGoal(goal, m_MoveRequest);
BeginPathing(pos, goal);
if (ComputeGoal(goal, m_MoveRequest))
BeginPathing(pos, goal);
}
}
@ -896,7 +896,9 @@ bool CCmpUnitMotion::HandleObstructedMove()
// Else, just entirely recompute
PathGoal goal;
ComputeGoal(goal, m_MoveRequest);
if (!ComputeGoal(goal, m_MoveRequest))
return false;
BeginPathing(pos, goal);
// potential TODO: We could switch the short-range pathfinder for something else entirely.
@ -962,7 +964,8 @@ bool CCmpUnitMotion::TryGoingStraightToTarget(const CFixedVector2D& from)
// Move the goal to match the target entity's new position
PathGoal goal;
ComputeGoal(goal, m_MoveRequest);
if (!ComputeGoal(goal, m_MoveRequest))
return false;
goal.x = targetPos.X;
goal.z = targetPos.Y;
// (we ignore changes to the target's rotation, since only buildings are