summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-08-20 12:48:13 +0200
committerGitHub <noreply@github.com>2019-08-20 12:48:13 +0200
commita1aeeb34d0ae0d52806477eeb2d05c29d2fa2b68 (patch)
tree392c776acec73f6919d78046db56fd246ccec3e9
parent8b27f091f228ecb51a392f3048c55cb7387ac5fd (diff)
parent17be67b8c726fe5c87a296e64a739033dd2890dd (diff)
Merge pull request #31482 from Faless/ws/fix_relay
WebSocketServer now sanitize destination peers.
-rw-r--r--modules/websocket/websocket_multiplayer_peer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer_peer.cpp
index 62f09bfbf9..362a1ebe0b 100644
--- a/modules/websocket/websocket_multiplayer_peer.cpp
+++ b/modules/websocket/websocket_multiplayer_peer.cpp
@@ -265,7 +265,10 @@ Error WebSocketMultiplayerPeer::_server_relay(int32_t p_from, int32_t p_to, cons
ERR_FAIL_COND_V(p_to == p_from, FAILED);
- return get_peer(p_to)->put_packet(p_buffer, p_buffer_size); // Sending to specific peer
+ Ref<WebSocketPeer> peer_to = get_peer(p_to);
+ ERR_FAIL_COND_V(peer_to.is_null(), FAILED);
+
+ return peer_to->put_packet(p_buffer, p_buffer_size); // Sending to specific peer
}
}