Skip to content

Formation: guard setLeader's find against an empty active range #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivan-ushakov merged 1 commit into from
Jul 19, 2026
Merged

Formation: guard setLeader's find against an empty active range #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Physics/FormationController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,20 @@ class FormationController
{
if(leader_ == leader)
return;
iterator it = find(begin() + 1, inactive(), leader);
if(it != end())
std::swap(front(), *it);
// Promote `leader` to the front of the active units if it is one of them. Guard the
// find against an empty active range: with no active units inactive() == begin(),
// so find(begin()+1, begin()) has first > last and runs forward off the end of the
// heap (the reported EXC_BAD_ACCESS). makeAllActive avoids this only because it first
// sets firstInactive_ = size(), so its guard is empty(); here the active range is a
// prefix, so we guard on activeSize(). Compare against inactive(), the range's end,
// not end(): find returns inactive() when `leader` is not active, and inactive() !=
// end() whenever inactive units follow -- `it != end()` would then swap an inactive
// unit to the front.
if(activeSize() > 0){
iterator it = find(begin() + 1, inactive(), leader);
if(it != inactive())
std::swap(front(), *it);
}
leader_ = leader;
}

Expand Down
Loading