diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-21 21:06:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 21:06:11 +0100 |
| commit | 79aaafc686ac57ea535d0542e123e9f45a097e69 (patch) | |
| tree | f1550552810dd4f00ba445ee2d270052609b4e68 | |
| parent | 24960e2254a7fbe274c20dc719bbe68ae6b3fd53 (diff) | |
| parent | 50f1b035b89ab8c4559620e12ab55cf7458fc291 (diff) | |
Merge pull request #35408 from Faless/ws/fix_packet_count
Fix MultiplayerAPI crash when peer implementation misbehave.
| -rw-r--r-- | core/io/multiplayer_api.cpp | 1 | ||||
| -rw-r--r-- | modules/websocket/websocket_multiplayer_peer.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/io/multiplayer_api.cpp b/core/io/multiplayer_api.cpp index 2708cb8c01..381ac4c0bb 100644 --- a/core/io/multiplayer_api.cpp +++ b/core/io/multiplayer_api.cpp @@ -111,6 +111,7 @@ void MultiplayerAPI::poll() { Error err = network_peer->get_packet(&packet, len); if (err != OK) { ERR_PRINT("Error getting packet!"); + break; // Something is wrong! } rpc_sender_id = sender; diff --git a/modules/websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer_peer.cpp index b639c635fd..27ea50b524 100644 --- a/modules/websocket/websocket_multiplayer_peer.cpp +++ b/modules/websocket/websocket_multiplayer_peer.cpp @@ -98,7 +98,7 @@ void WebSocketMultiplayerPeer::_bind_methods() { // int WebSocketMultiplayerPeer::get_available_packet_count() const { - ERR_FAIL_COND_V_MSG(!_is_multiplayer, ERR_UNCONFIGURED, "Please use get_peer(ID).get_available_packet_count to get available packet count from peers when not using the MultiplayerAPI."); + ERR_FAIL_COND_V_MSG(!_is_multiplayer, 0, "Please use get_peer(ID).get_available_packet_count to get available packet count from peers when not using the MultiplayerAPI."); return _incoming_packets.size(); } |