Fix use-after-free at shutdown, sync API files

godotengine · Oct 11, 2022 · daadd05 · daadd05
1 parent 779eaba
commit daadd05
Show file tree

Hide file tree

Showing 3 changed files with 1,650 additions and 524 deletions.
diff --git a/binding_generator.py b/binding_generator.py
@@ -1169,6 +1169,8 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
     if is_singleton:
         result.append(f"\tstatic {class_name} *get_singleton();")
         result.append("")
+        result.append(f"\t~{class_name}();")
+        result.append("")
 
     if "methods" in class_api:
         for method in class_api["methods"]:
@@ -1291,6 +1293,8 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
     result.append("")
 
     if is_singleton:
+        result.append(f"static bool {class_name}_singleton_destroyed = false;")
+        result.append("")
         result.append(f"{class_name} *{class_name}::get_singleton() {{")
         result.append(
             f'\tstatic GDNativeObjectPtr singleton_obj = internal::gdn_interface->global_get_singleton("{class_name}");'
@@ -1301,9 +1305,20 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
         result.append(
             f"\tstatic {class_name} *singleton = reinterpret_cast<{class_name} *>(internal::gdn_interface->object_get_instance_binding(singleton_obj, internal::token, &{class_name}::___binding_callbacks));"
         )
+        result.append(f"\tstatic struct {class_name}_BindingsCleanup {{")
+        result.append(f"\t\t~{class_name}_BindingsCleanup() {{")
+        result.append(f'\t\t\tif (!{class_name}_singleton_destroyed) {{')
+        result.append("\t\t\t\tinternal::gdn_interface->object_clear_instance_binding(singleton_obj, internal::token);")
+        result.append("\t\t\t}")
+        result.append("\t\t}")
+        result.append("\t} bindings_cleanup;")
         result.append("\treturn singleton;")
         result.append("}")
         result.append("")
+        result.append(f"{class_name}::~{class_name}() {{")
+        result.append(f"\t{class_name}_singleton_destroyed = true;")
+        result.append("}")
+        result.append("")
 
     if "methods" in class_api:
         for method in class_api["methods"]: