Skip to content

Fix crash when destroying a gangzone while UseGangZoneCheck is active #1240

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
krzysztofmotas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crash when destroying a gangzone while UseGangZoneCheck is active #1240

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
44 changes: 39 additions & 5 deletions Server/Components/GangZones/gangzone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,28 @@ class GangZonesComponent final : public IGangZonesComponent, public PlayerConnec
// Only go through those that are added to our checking list using IGangZonesComponent::useGangZoneCheck
if (checkingList.entries().size())
{
// Snapshot IDs: destroying a gangzone during dispatch below must not mutate
// checkingList while we're iterating over it.
DynamicArray<int> ids;
ids.reserve(checkingList.entries().size());
for (auto gangzone : checkingList.entries())
{
ids.push_back(gangzone->getID());
}

const Vector3& playerPos = player.getPosition();
DynamicArray<IGangZone*> enteredList;
DynamicArray<int> enteredList;
// Guarantee a single allocation
enteredList.reserve(checkingList.entries().size());
enteredList.reserve(ids.size());

for (auto gangzone : checkingList.entries())
for (int id : ids)
{
IGangZone* gangzone = get(id);
if (!gangzone || !checkingList.valid(id))
{
continue;
}

// Only check visible gangzones
if (!gangzone->isShownForPlayer(player))
{
Expand All @@ -175,7 +190,7 @@ class GangZonesComponent final : public IGangZonesComponent, public PlayerConnec
if (isPlayerInZoneArea && !isPlayerInInsideList)
{
// Collect entered gangzones to call events with them later after exit events
enteredList.push_back(gangzone);
enteredList.push_back(id);
}
else if (!isPlayerInZoneArea && isPlayerInInsideList)
{
Expand All @@ -190,8 +205,14 @@ class GangZonesComponent final : public IGangZonesComponent, public PlayerConnec
}

// Call enter gangzone events for all the gangzones in entered gangzone list
for (auto gangzone : enteredList)
for (int id : enteredList)
{
IGangZone* gangzone = get(id);
if (!gangzone || !checkingList.valid(id) || !gangzone->isShownForPlayer(player))
{
continue;
}

ScopedPoolReleaseLock<IGangZone> lock(*this, *gangzone);
static_cast<GangZone*>(gangzone)->setPlayerInside(player, true);
eventDispatcher.dispatch(
Expand Down Expand Up @@ -319,8 +340,21 @@ class GangZonesComponent final : public IGangZonesComponent, public PlayerConnec
void onPlayerClickMap(IPlayer& player, Vector3 clickPos) override
{
// Only go through those that are added to our checking list using IGangZonesComponent::toggleGangZoneCheck
DynamicArray<int> ids;
ids.reserve(checkingList.entries().size());
for (auto gangzone : checkingList.entries())
{
ids.push_back(gangzone->getID());
}

for (int id : ids)
{
IGangZone* gangzone = get(id);
if (!gangzone || !checkingList.valid(id))
{
continue;
}

// only check visible gangzones
if (!gangzone->isShownForPlayer(player))
{
Expand Down