Changeset 11707 for code/trunk/src/modules/pickup

Timestamp:

Jan 6, 2018, 4:34:18 PM (7 years ago)

Author:

landauf

Message:

fixed nullptr access when two pawns trigger a pickup-spawner at the same time (for the second pawn in the list, the pickup is already nullptr → crash)

File:

• code/trunk/src/modules/pickup/PickupSpawner.cc (modified) (2 diffs)

code/trunk/src/modules/pickup/PickupSpawner.cc

@@ -158 +158 @@
             for(Pawn* pawn : ObjectList<Pawn>())
             {
-                if(spawner == nullptr) // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute).
-                    break;
-
                 Vector3 distance = pawn->getWorldPosition() - this->getWorldPosition();
                 PickupCarrier* carrier = static_cast<PickupCarrier*>(pawn);
@@ -167 +164 @@
                 {
                     if(carrier->isTarget(this->pickup_))
-                        this->trigger(pawn);
+                    {
+                        this->trigger(pawn); // Attention: after this line, pickup_ is probably nullptr (because it was taken) and even spawner can be nullptr (if it run out of pickups)!
+                        break;
+                    }
                 }
             }