godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73705 from anvilfolk/doublewoopsie

Browse Source 
Added check for null objects in gdscript typed assign.
This commit is contained in:
Rémi Verschelde 2023-02-21 23:36:06 +01:00
commit d4bec5855e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/gdscript/gdscript_vm.cpp
View File

@ -1326,28 +1326,30 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
OPCODE_BREAK; OPCODE_BREAK;
} }
ScriptInstance *scr_inst = val_obj->get_script_instance(); if (val_obj) { // src is not null
if (!scr_inst) { ScriptInstance *scr_inst = val_obj->get_script_instance();
err_text = "Trying to assign value of type '" + val_obj->get_class_name() + if (!scr_inst) {
"' to a variable of type '" + base_type->get_path().get_file() + "'."; err_text = "Trying to assign value of type '" + val_obj->get_class_name() +
OPCODE_BREAK; "' to a variable of type '" + base_type->get_path().get_file() + "'.";
} OPCODE_BREAK;
Script *src_type = val_obj->get_script_instance()->get_script().ptr();
bool valid = false;
while (src_type) {
if (src_type == base_type) {
valid = true;
break;
} }
src_type = src_type->get_base_script().ptr();
}
if (!valid) { Script *src_type = scr_inst->get_script().ptr();
err_text = "Trying to assign value of type '" + val_obj->get_script_instance()->get_script()->get_path().get_file() + bool valid = false;
"' to a variable of type '" + base_type->get_path().get_file() + "'.";
OPCODE_BREAK; while (src_type) {
if (src_type == base_type) {
valid = true;
break;
}
src_type = src_type->get_base_script().ptr();
}
if (!valid) {
err_text = "Trying to assign value of type '" + val_obj->get_script_instance()->get_script()->get_path().get_file() +
"' to a variable of type '" + base_type->get_path().get_file() + "'.";
OPCODE_BREAK;
}
} }
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED

18
modules/gdscript/tests/scripts/analyzer/features/script_typed_assign_null.gd Normal file
View File

@ -0,0 +1,18 @@
extends Node
class LocalClass extends Node:
pass
func test():
var typed: LocalClass = get_node_or_null("does_not_exist")
var untyped = null
var node_1: LocalClass = typed
var node_2: LocalClass = untyped
var node_3 = typed
var node_4 = untyped
print(typed)
print(untyped)
print(node_1)
print(node_2)
print(node_3)
print(node_4)

7
modules/gdscript/tests/scripts/analyzer/features/script_typed_assign_null.out Normal file
View File

@ -0,0 +1,7 @@
GDTEST_OK
<Object#null>
<null>
<Object#null>
<null>
<Object#null>
<null>