Fix UB when a unique effect script adds another unique effect during initialization

1 files changed, 6 insertions, 4 deletions

diff --git a/source/game/StarStatusController.cpp b/source/game/StarStatusController.cpp
index 325fc17..26c83d0 100644
--- a/source/game/StarStatusController.cpp
+++ b/source/game/StarStatusController.cpp
@@ -410,8 +410,9 @@ void StatusController::init(Entity* parentEntity, ActorMovementController* movem
 
   if (m_parentEntity->isMaster()) {
     initPrimaryScript();
-    for (auto& p : m_uniqueEffects)
-      initUniqueEffectScript(p.second);
+    for (auto& p : m_uniqueEffects.keys())
+      if (auto effect = m_uniqueEffects.ptr(p))
+        initUniqueEffectScript(*effect);
   }
 
   m_environmentStatusEffectUpdateTimer.reset();
@@ -421,8 +422,9 @@ void StatusController::uninit() {
   m_parentEntity = nullptr;
   m_movementController = nullptr;
 
-  for (auto& p : m_uniqueEffects)
-    uninitUniqueEffectScript(p.second);
+  for (auto& p : m_uniqueEffects.keys())
+    if (auto effect = m_uniqueEffects.ptr(p))
+      uninitUniqueEffectScript(*effect);
   uninitPrimaryScript();
 
   m_recentHitsGiven.reset();