Formation: guard setLeader's find against an empty active range#19
Merged
Merged
Conversation
FormationUnits::setLeader ran find(begin()+1, inactive(), leader) with no guard on the active range. inactive() is begin()+firstInactive_; when there are no active units (firstInactive_==0) inactive()==begin(), so the range is find(begin()+1, begin()) -- first > last. std::find walks forward looking for last and runs off the end of the heap, the reported EXC_BAD_ACCESS (fault address 0xc25c00000, a MALLOC_SMALL region boundary), reached via UnitLegionary::Kill -> UnitActing::finishUpgrade. Guard the find with activeSize() > 0 (makeAllActive avoids the same trap only because it first sets firstInactive_ = size()). Also compare the result against inactive(), the range's end, rather than end(): find returns inactive() when the leader is not among the active units, and inactive() != end() whenever inactive units follow -- the old `it != end()` check would then swap an inactive unit to the front. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.