Fix raw object decoding with no data.

godotengine · Aug 12, 2021 · 6ab1c1b · 6ab1c1b
1 parent 1fbd39e
commit 6ab1c1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/io/multiplayer_api.cpp b/core/io/multiplayer_api.cpp
@@ -1044,8 +1044,6 @@ Node *MultiplayerAPI::get_cached_node(int p_from, uint32_t p_node_id) {
 	ERR_FAIL_COND_V_MSG(!F, nullptr, vformat("ID %d not found in cache of peer %d.", p_node_id, p_from));
 
 	PathGetCache::NodeInfo *ni = &F->get();
-	// Do proper caching later.
-
 	Node *node = root_node->get_node(ni->path);
 	if (!node) {
 		ERR_PRINT("Failed to get cached path: " + String(ni->path) + ".");

diff --git a/core/io/multiplayer_replicator.cpp b/core/io/multiplayer_replicator.cpp
@@ -241,6 +241,10 @@ Error MultiplayerReplicator::_encode_state(const List<Variant> &p_variants, uint
 Error MultiplayerReplicator::_decode_state(const List<StringName> &p_properties, Object *p_obj, const uint8_t *p_buffer, int p_len, int &r_len, bool p_raw) {
 	r_len = 0;
 	int argc = p_properties.size();
+	if (argc == 0 && p_raw) {
+		ERR_FAIL_COND_V_MSG(p_len != 0, ERR_INVALID_DATA, "Buffer has trailing bytes.");
+		return OK;
+	}
 	ERR_FAIL_COND_V(p_raw && argc != 1, ERR_INVALID_DATA);
 	if (p_raw) {
 		r_len = p_len;