evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kae 2024-11-21 15:31:28 +11:00
parent 996dc77967
commit a59ff847bc
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/opensb/interface/windowconfig/charselection.config.patch
View File

@ -1,4 +1,4 @@
[{"op":"merge", "path":"", "value": { {
"createCharButton" : { "createCharButton" : {
"type" : "button", "type" : "button",
"base" : "/interface/title/createcharacter.png", "base" : "/interface/title/createcharacter.png",
@ -6,4 +6,4 @@
"position" : [23, 241], "position" : [23, 241],
"pressedOffset" : [0, 0] "pressedOffset" : [0, 0]
} }
}}] }

10
source/game/StarStatusController.cpp
View File

@ -410,8 +410,9 @@ void StatusController::init(Entity* parentEntity, ActorMovementController* movem
if (m_parentEntity->isMaster()) { if (m_parentEntity->isMaster()) {
initPrimaryScript(); initPrimaryScript();
for (auto& p : m_uniqueEffects) for (auto& p : m_uniqueEffects.keys())
initUniqueEffectScript(p.second); if (auto effect = m_uniqueEffects.ptr(p))
initUniqueEffectScript(*effect);
} }
m_environmentStatusEffectUpdateTimer.reset(); m_environmentStatusEffectUpdateTimer.reset();
@ -421,8 +422,9 @@ void StatusController::uninit() {
m_parentEntity = nullptr; m_parentEntity = nullptr;
m_movementController = nullptr; m_movementController = nullptr;
for (auto& p : m_uniqueEffects) for (auto& p : m_uniqueEffects.keys())
uninitUniqueEffectScript(p.second); if (auto effect = m_uniqueEffects.ptr(p))
uninitUniqueEffectScript(*effect);
uninitPrimaryScript(); uninitPrimaryScript();
m_recentHitsGiven.reset(); m_recentHitsGiven.reset();