asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Callable not crash on call when the object has been freed

Browse source 
Also add a GDScript test for this case.
This commit is contained in:
George Marques 2021-05-24 14:18:39 -03:00
parent ffdb3cccd2
commit ea44744e2d
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
3 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/variant/callable.cpp
View file

@ -50,6 +50,15 @@ void Callable::call(const Variant **p_arguments, int p_argcount, Variant &r_retu
custom->call(p_arguments, p_argcount, r_return_value, r_call_error); custom->call(p_arguments, p_argcount, r_return_value, r_call_error);
} else { } else {
Object *obj = ObjectDB::get_instance(ObjectID(object)); Object *obj = ObjectDB::get_instance(ObjectID(object));
#ifdef DEBUG_ENABLED
if (!obj) {
r_call_error.error = CallError::CALL_ERROR_INSTANCE_IS_NULL;
r_call_error.argument = 0;
r_call_error.expected = 0;
r_return_value = Variant();
return;
}
#endif
r_return_value = obj->call(method, p_arguments, p_argcount, r_call_error); r_return_value = obj->call(method, p_arguments, p_argcount, r_call_error);
} }
} }

5
modules/gdscript/tests/scripts/runtime/errors/callable_call_after_free_object.gd Normal file
View file

@ -0,0 +1,5 @@
func test():
var node := Node.new()
var inside_tree = node.is_inside_tree
node.free()
inside_tree.call()

6
modules/gdscript/tests/scripts/runtime/errors/callable_call_after_free_object.out Normal file
View file

@ -0,0 +1,6 @@
GDTEST_RUNTIME_ERROR
>> SCRIPT ERROR
>> on function: test()
>> runtime/errors/callable_call_after_free_object.gd
>> 5
>> Attempt to call function 'null::is_inside_tree (Callable)' on a null instance.