From 5134c82573b727887b4f8dbd574c4db954298452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Thu, 5 Oct 2023 00:33:47 +0200 Subject: [PATCH] Fixes crash in ClassDB::deinitialize due to usage of invalid iterator. After the removed call to `std::vector::erase` all iterators, `i` included, are invalidated and therefore this code has undefined behavior (which can or not lead to a crash). This change delays the removal of class names from `class_register_order` to after having gone through it's content, removing the undefined behavior. --- src/core/class_db.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/core/class_db.cpp b/src/core/class_db.cpp index 7219a79..1f4b135 100644 --- a/src/core/class_db.cpp +++ b/src/core/class_db.cpp @@ -352,6 +352,7 @@ void ClassDB::initialize(GDExtensionInitializationLevel p_level) { } void ClassDB::deinitialize(GDExtensionInitializationLevel p_level) { + std::set to_erase; for (std::vector::reverse_iterator i = class_register_order.rbegin(); i != class_register_order.rend(); ++i) { const StringName &name = *i; const ClassInfo &cl = classes[name]; @@ -362,12 +363,20 @@ void ClassDB::deinitialize(GDExtensionInitializationLevel p_level) { internal::gdextension_interface_classdb_unregister_extension_class(internal::library, name._native_ptr()); - for (auto method : cl.method_map) { + for (const std::pair &method : cl.method_map) { memdelete(method.second); } - classes.erase(*i); - class_register_order.erase((i + 1).base()); + classes.erase(name); + to_erase.insert(name); + } + + { + // The following is equivalent to c++20 `std::erase_if(class_register_order, [&](const StringName& name){ return to_erase.contains(name); });` + std::vector::iterator it = std::remove_if(class_register_order.begin(), class_register_order.end(), [&](const StringName &p_name) { + return to_erase.count(p_name) > 0; + }); + class_register_order.erase(it, class_register_order.end()); } }