From f65b15803a48335e847d52233fdae71e2c7650de Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 5 May 2016 15:04:39 -0700
Subject: [PATCH] Fix potential iterator invalidation
---
libraries/physics/src/PhysicsEngine.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index 5523abf4e2..d3247ec62c 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -225,9 +225,7 @@ void PhysicsEngine::removeContacts(ObjectMotionState* motionState) {
ContactMap::iterator contactItr = _contactMap.begin();
while (contactItr != _contactMap.end()) {
if (contactItr->first._a == motionState || contactItr->first._b == motionState) {
- ContactMap::iterator iterToDelete = contactItr;
- ++contactItr;
- _contactMap.erase(iterToDelete);
+ contactItr = _contactMap.erase(contactItr);
} else {
++contactItr;
}
@@ -386,9 +384,7 @@ const CollisionEvents& PhysicsEngine::getCollisionEvents() {
}
if (type == CONTACT_EVENT_TYPE_END) {
- ContactMap::iterator iterToDelete = contactItr;
- ++contactItr;
- _contactMap.erase(iterToDelete);
+ contactItr = _contactMap.erase(contactItr);
} else {
++contactItr;
}