mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Fix using iterators that are deleted by the plugin

Browse Source
This commit is contained in:
ζeh Matt
2024-01-25 17:00:43 +02:00
parent 49ff5a1826
commit 84213efde2
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -1634,7 +1634,7 @@ void ScriptEngine::RemoveInterval(const std::shared_ptr<Plugin>& plugin, Interva
// Only allow owner or REPL (nullptr) to remove intervals
if (plugin == nullptr || interval.Owner == plugin)
{
_intervals.erase(it);
interval.Deleted = true;
}
}
@@ -1653,21 +1653,37 @@ void ScriptEngine::UpdateIntervals()
}
_lastIntervalTimestamp = timestamp;
for (auto it = _intervals.begin(), itNext = it; it != _intervals.end(); it = itNext)
// Erase all intervals marked as deleted.
for (auto it = _intervals.begin(); it != _intervals.end();)
{
itNext++;
auto& interval = it->second;
if (timestamp >= interval.LastTimestamp + interval.Delay)
if (interval.Deleted)
{
ExecutePluginCall(interval.Owner, interval.Callback, {}, false);
it = _intervals.erase(it);
}
else
{
it++;
}
}
interval.LastTimestamp = timestamp;
if (!interval.Repeat)
{
_intervals.erase(it);
}
// Execute all intervals that are due.
for (auto it = _intervals.begin(); it != _intervals.end(); it++)
{
auto& interval = it->second;
if (timestamp < interval.LastTimestamp + interval.Delay)
{
continue;
}
ExecutePluginCall(interval.Owner, interval.Callback, {}, false);
interval.LastTimestamp = timestamp;
if (!interval.Repeat)
{
interval.Deleted = true;
}
}
}