Skip to content

Commit

Permalink
GDScript: Don't fail when freed object is return
Browse files Browse the repository at this point in the history
This is check is a bit too eager. The user should be able to handle the
return value even if it's a freed object.
  • Loading branch information
vnen committed Apr 26, 2023
1 parent e2e870c commit abbdf80
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
4 changes: 0 additions & 4 deletions modules/gdscript/gdscript_vm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1651,10 +1651,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
bool was_freed = false;
Object *obj = ret->get_validated_object_with_check(was_freed);

if (was_freed) {
err_text = "Got a freed object as a result of the call.";
OPCODE_BREAK;
}
if (obj && obj->is_class_ptr(GDScriptFunctionState::get_class_ptr_static())) {
err_text = R"(Trying to call an async function without "await".)";
OPCODE_BREAK;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# https://github.com/godotengine/godot/issues/68184

var node: Node:
get:
return node
set(n):
node = n


func test():
node = Node.new()
node.free()

if !is_instance_valid(node):
print("It is freed")
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
GDTEST_OK
It is freed

0 comments on commit abbdf80

Please sign in to comment.