diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-28 17:26:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 17:26:44 +0200 |
| commit | 622b656c40f9d8d9c8fdd45d6727f416952636d7 (patch) | |
| tree | 3f725349ae1715e32441aae96271795d9f153e33 | |
| parent | 2ea7765f7678cb187f15cf4bf585a2f5536f94c3 (diff) | |
| parent | 6141ce2cb8ae54965190257a1ffd6a6abd02aaea (diff) | |
| download | redot-engine-622b656c40f9d8d9c8fdd45d6727f416952636d7.tar.gz | |
Merge pull request #53135 from briansemrau/fix-ref-leak
| -rw-r--r-- | core/variant/variant_internal.h | 7 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_vm.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/variant/variant_internal.h b/core/variant/variant_internal.h index 3696ffae60..e0cfb42e1e 100644 --- a/core/variant/variant_internal.h +++ b/core/variant/variant_internal.h @@ -304,6 +304,13 @@ public: v->_get_obj().id = ObjectID(); } + static void update_object_id(Variant *v) { + const Object *o = v->_get_obj().obj; + if (o) { + v->_get_obj().id = o->get_instance_id(); + } + } + _FORCE_INLINE_ static void *get_opaque_pointer(Variant *v) { switch (v->type) { case Variant::NIL: diff --git a/modules/gdscript/gdscript_vm.cpp b/modules/gdscript/gdscript_vm.cpp index 16a8e728e4..1d56dae982 100644 --- a/modules/gdscript/gdscript_vm.cpp +++ b/modules/gdscript/gdscript_vm.cpp @@ -1897,7 +1897,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a VariantInternal::initialize(ret, Variant::OBJECT); Object **ret_opaque = VariantInternal::get_object(ret); method->ptrcall(base_obj, argptrs, ret_opaque); - VariantInternal::object_assign(ret, *ret_opaque); // Set so ID is correct too. + VariantInternal::update_object_id(ret); #ifdef DEBUG_ENABLED if (GDScriptLanguage::get_singleton()->profiling) { |