godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #96864 from KoBeWi/dictionerrory 

Fix `Dictionary.merge()` type validation
This commit is contained in:
Rémi Verschelde 2024-09-12 09:25:42 +02:00
parent f8b29d54a3 48d5b8a8b8
commit 60ffa9645a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/variant/dictionary.cpp
View File

@ -261,7 +261,7 @@ void Dictionary::merge(const Dictionary &p_dictionary, bool p_overwrite) {
Variant key = E.key; Variant key = E.key;
Variant value = E.value; Variant value = E.value;
ERR_FAIL_COND(!_p->typed_key.validate(key, "merge")); ERR_FAIL_COND(!_p->typed_key.validate(key, "merge"));
ERR_FAIL_COND(!_p->typed_key.validate(value, "merge")); ERR_FAIL_COND(!_p->typed_value.validate(value, "merge"));
if (p_overwrite || !has(key)) { if (p_overwrite || !has(key)) {
operator[](key) = value; operator[](key) = value;
} }