Skip to content

OverlordContain: Fix iterator invalidation in removeAllRedirectedContained #127

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −16
Open

OverlordContain: Fix iterator invalidation in removeAllRedirectedContained #127

Show file tree
Hide file tree
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
14 changes: 6 additions & 8 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,13 @@ void OverlordContain::removeAllContained( Bool exposeStealthUnits )
return;
}

const ContainedItemsList *fullList = getRedirectedContain()->getContainedItemsList();

Object *obj;
ContainedItemsList::const_iterator it;
it = (*fullList).begin();
while( it != (*fullList).end() )
// Use a safe iterator pattern to avoid iterator invalidation.
// Always get a fresh iterator from the beginning after each removal,
// similar to OpenContain::removeAllContained()
const ContainedItemsList *fullList;
while( (fullList = getRedirectedContain()->getContainedItemsList()) != NULL && !fullList->empty() )
{
obj = *it;
it++;
Object *obj = fullList->front();
removeFromContain( obj, exposeStealthUnits );
}
}
Expand Down
14 changes: 6 additions & 8 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,13 @@ void OverlordContain::removeAllContained( Bool exposeStealthUnits )
return;
}

const ContainedItemsList *fullList = getRedirectedContain()->getContainedItemsList();

Object *obj;
ContainedItemsList::const_iterator it;
it = (*fullList).begin();
while( it != (*fullList).end() )
// Use a safe iterator pattern to avoid iterator invalidation.
// Always get a fresh iterator from the beginning after each removal,
// similar to OpenContain::removeAllContained()
const ContainedItemsList *fullList;
while( (fullList = getRedirectedContain()->getContainedItemsList()) != NULL && !fullList->empty() )
{
obj = *it;
it++;
Object *obj = fullList->front();
removeFromContain( obj, exposeStealthUnits );
}
}
Expand Down
Loading