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

Merge pull request #89647 from AThousandShips/read_only_dict

Browse source 
[Core] Fix property access on read-only `Dictionary`
This commit is contained in:
Rémi Verschelde 2024-05-01 09:54:48 +02:00
commit 273a643145
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/variant/variant_setget.cpp
View file

@ -251,15 +251,21 @@ void Variant::set_named(const StringName &p_member, const Variant &p_value, bool
return; return;
} }
} else if (type == Variant::DICTIONARY) { } else if (type == Variant::DICTIONARY) {
Variant *v = VariantGetInternalPtr<Dictionary>::get_ptr(this)->getptr(p_member); Dictionary &dict = *VariantGetInternalPtr<Dictionary>::get_ptr(this);
if (v) {
*v = p_value; if (dict.is_read_only()) {
r_valid = true; r_valid = false;
} else { return;
VariantGetInternalPtr<Dictionary>::get_ptr(this)->operator[](p_member) = p_value;
r_valid = true;
} }
Variant *v = dict.getptr(p_member);
if (v) {
*v = p_value;
} else {
dict[p_member] = p_value;
}
r_valid = true;
} else { } else {
r_valid = false; r_valid = false;
} }

4
modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.gd Normal file
View file

@ -0,0 +1,4 @@
func test():
var dictionary := { "a": 0 }
dictionary.make_read_only()
dictionary.a = 1

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

@ -0,0 +1,6 @@
GDTEST_RUNTIME_ERROR
>> SCRIPT ERROR
>> on function: test()
>> runtime/errors/read_only_dictionary.gd
>> 4
>> Invalid assignment of property or key 'a' with value of type 'int' on a base object of type 'Dictionary'.