Merge pull request #891 from mihe/classdb-deinit

Fix use-after-free when deleting objects from extension terminator
2022-10-11 08:22:50 +02:00 · 2022-10-11 08:22:50 +02:00 · 779eaba428
parent 6696bebfa6 cddaf50ff8
commit 779eaba428
1 changed files with 2 additions and 1 deletions
--- a/src/godot.cpp
+++ b/src/godot.cpp
@ -79,11 +79,12 @@ void GDExtensionBinding::initialize_level(void *userdata, GDNativeInitialization

 void GDExtensionBinding::deinitialize_level(void *userdata, GDNativeInitializationLevel p_level) {
 	ClassDB::current_level = p_level;
-	ClassDB::deinitialize(p_level);

 	if (terminate_callback) {
 		terminate_callback(static_cast<ModuleInitializationLevel>(p_level));
 	}
+
+	ClassDB::deinitialize(p_level);
 }

 void GDExtensionBinding::InitObject::register_initializer(Callback p_init) const {