mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix #15442: Use after free in object manager

Browse Source
This commit is contained in:
ζeh Matt
2021-09-21 01:34:58 -07:00
committed by GitHub
parent fddf009afc
commit c56810e6a5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/Editor.cpp
View File

@@ -63,15 +63,18 @@ namespace Editor
static void object_list_load() static void object_list_load()
{ {
auto* context = GetContext();
// Unload objects first, the repository is re-populated which owns the objects.
auto& objectManager = context->GetObjectManager();
objectManager.UnloadAll();
// Scan objects if necessary // Scan objects if necessary
auto context = GetContext();
const auto& localisationService = context->GetLocalisationService(); const auto& localisationService = context->GetLocalisationService();
auto& objectRepository = context->GetObjectRepository(); auto& objectRepository = context->GetObjectRepository();
objectRepository.LoadOrConstruct(localisationService.GetCurrentLanguage()); objectRepository.LoadOrConstruct(localisationService.GetCurrentLanguage());
// Reset loaded objects to just defaults // Reset loaded objects to just defaults
auto& objectManager = context->GetObjectManager();
objectManager.UnloadAll();
objectManager.LoadDefaultObjects(); objectManager.LoadDefaultObjects();
} }