gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-15 21:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84611 from AThousandShips/encode_invalid

Browse source 
Prevent encoding/decoding objects that cannot be instantiated
This commit is contained in:
Yuri Sizov 2023-12-19 20:32:42 +01:00
parent 179b8c7973 c1b8b87736
commit 6fc92e1d05
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/io/marshalls.cpp
View file

@ -638,6 +638,8 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
if (str.is_empty()) {
r_variant = (Object *)nullptr;
} else {
ERR_FAIL_COND_V(!ClassDB::can_instantiate(str), ERR_INVALID_DATA);
Object *obj = ClassDB::instantiate(str);
ERR_FAIL_NULL_V(obj, ERR_UNAVAILABLE);
@ -1492,6 +1494,8 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += 4;
} else {
ERR_FAIL_COND_V(!ClassDB::can_instantiate(obj->get_class()), ERR_INVALID_PARAMETER);
_encode_string(obj->get_class(), buf, r_len);
List<PropertyInfo> props;