diff --git a/core/variant/variant_setget.cpp b/core/variant/variant_setget.cpp index 9d5ed22b1aa..f49e9e54b34 100644 --- a/core/variant/variant_setget.cpp +++ b/core/variant/variant_setget.cpp @@ -251,15 +251,21 @@ void Variant::set_named(const StringName &p_member, const Variant &p_value, bool return; } } else if (type == Variant::DICTIONARY) { - Variant *v = VariantGetInternalPtr::get_ptr(this)->getptr(p_member); - if (v) { - *v = p_value; - r_valid = true; - } else { - VariantGetInternalPtr::get_ptr(this)->operator[](p_member) = p_value; - r_valid = true; + Dictionary &dict = *VariantGetInternalPtr::get_ptr(this); + + if (dict.is_read_only()) { + r_valid = false; + return; } + Variant *v = dict.getptr(p_member); + if (v) { + *v = p_value; + } else { + dict[p_member] = p_value; + } + + r_valid = true; } else { r_valid = false; } diff --git a/modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.gd b/modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.gd new file mode 100644 index 00000000000..2f31ecc52f0 --- /dev/null +++ b/modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.gd @@ -0,0 +1,4 @@ +func test(): + var dictionary := { "a": 0 } + dictionary.make_read_only() + dictionary.a = 1 diff --git a/modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.out b/modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.out new file mode 100644 index 00000000000..da7ce58d733 --- /dev/null +++ b/modules/gdscript/tests/scripts/runtime/errors/read_only_dictionary.out @@ -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'.