godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #73544 from mashumafi/fix-func-arg-null

Browse Source 
Fix: Func with typed args error when arg is null
This commit is contained in:
Rémi Verschelde
2023-02-20 15:41:40 +01:00
parent 561d949739 30d4d3fa5e
commit ea2bc9795c
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gdscript/gdscript_function.h
View File

@@ -105,9 +105,10 @@ public:
return false;
}
Object *obj = p_variant.get_validated_object();
bool was_freed = false;
Object *obj = p_variant.get_validated_object_with_check(was_freed);
if (!obj) {
return false;
return !was_freed;
}
if (!ClassDB::is_parent_class(obj->get_class_name(), native_type)) {
@@ -124,9 +125,10 @@ public:
return false;
}
Object *obj = p_variant.get_validated_object();
bool was_freed = false;
Object *obj = p_variant.get_validated_object_with_check(was_freed);
if (!obj) {
return false;
return !was_freed;
}
Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : nullptr;