Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from Zylann/fix_ref_return_leak 

Fix Ref leak when using Godot getters
pull/90/head
Thomas Herzog 2018-01-26 10:36:58 +01:00 committed by GitHub
parent 8601a4678e ac0679eb1a
commit d7d814f861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binding_generator.py
View File

@ -346,7 +346,7 @@ def generate_class_implementation(icalls, used_classes, c):
if is_enum(method["return_type"]): if is_enum(method["return_type"]):
return_statement += "return (" + remove_enum_prefix(method["return_type"]) + ") " return_statement += "return (" + remove_enum_prefix(method["return_type"]) + ") "
elif is_reference_type(method["return_type"]): elif is_reference_type(method["return_type"]):
return_statement += "return Ref<" + strip_name(method["return_type"]) + ">("; return_statement += "return Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor(";
else: else:
return_statement += "return " + ("(" + strip_name(method["return_type"]) + " *) " if is_class_type(method["return_type"]) else "") return_statement += "return " + ("(" + strip_name(method["return_type"]) + " *) " if is_class_type(method["return_type"]) else "")
else: else:
@ -414,7 +414,7 @@ def generate_class_implementation(icalls, used_classes, c):
cast = "" cast = ""
if is_class_type(method["return_type"]): if is_class_type(method["return_type"]):
if is_reference_type(method["return_type"]): if is_reference_type(method["return_type"]):
cast += "Ref<" + stip_name(method["return_type"]) + ">::__internal_constructor(__result);" cast += "Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor(__result);"
else: else:
cast += "(" + strip_name(method["return_type"]) + " *) (Object *) __result;" cast += "(" + strip_name(method["return_type"]) + " *) (Object *) __result;"
else: else:

9
include/core/Ref.hpp
View File

@ -199,6 +199,15 @@ public:
unref(); unref();
} }
// Used exclusively in the bindings to recreate the Ref Godot encapsulates in return values,
// without adding to the refcount.
inline static Ref<T> __internal_constructor(Object *obj)
{
Ref<T> r;
r.reference = (T*)obj;
return r;
}
}; };
} }