Merge pull request #891 from mihe/classdb-deinit

Fix use-after-free when deleting objects from extension terminator
godotengine · Oct 11, 2022 · 779eaba · 779eaba
2 parents 6696beb + cddaf50
commit 779eaba
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 {