1 files changed, 11 insertions, 11 deletions

diff --git a/modules/websocket/wsl_peer.cpp b/modules/websocket/wsl_peer.cpp
index 7f027e1c0d..15df4d039c 100644
--- a/modules/websocket/wsl_peer.cpp
+++ b/modules/websocket/wsl_peer.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -146,17 +146,17 @@ void wsl_msg_recv_callback(wslay_event_context_ptr ctx, const struct wslay_event
 	if (!peer_data->valid || peer_data->closing) {
 		return;
 	}
-	WSLPeer *peer = (WSLPeer *)peer_data->peer;
+	WSLPeer *peer = static_cast<WSLPeer *>(peer_data->peer);
 
 	if (peer->parse_message(arg) != OK) {
 		return;
 	}
 
 	if (peer_data->is_server) {
-		WSLServer *helper = (WSLServer *)peer_data->obj;
+		WSLServer *helper = static_cast<WSLServer *>(peer_data->obj);
 		helper->_on_peer_packet(peer_data->id);
 	} else {
-		WSLClient *helper = (WSLClient *)peer_data->obj;
+		WSLClient *helper = static_cast<WSLClient *>(peer_data->obj);
 		helper->_on_peer_packet();
 	}
 }
@@ -184,10 +184,10 @@ Error WSLPeer::parse_message(const wslay_event_on_msg_recv_arg *arg) {
 		}
 		if (!wslay_event_get_close_sent(_data->ctx)) {
 			if (_data->is_server) {
-				WSLServer *helper = (WSLServer *)_data->obj;
+				WSLServer *helper = static_cast<WSLServer *>(_data->obj);
 				helper->_on_close_request(_data->id, close_code, close_reason);
 			} else {
-				WSLClient *helper = (WSLClient *)_data->obj;
+				WSLClient *helper = static_cast<WSLClient *>(_data->obj);
 				helper->_on_close_request(close_code, close_reason);
 			}
 		}
@@ -242,15 +242,15 @@ void WSLPeer::poll() {
 Error WSLPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
 	ERR_FAIL_COND_V(!is_connected_to_host(), FAILED);
 	ERR_FAIL_COND_V(_out_pkt_size && (wslay_event_get_queued_msg_count(_data->ctx) >= (1ULL << _out_pkt_size)), ERR_OUT_OF_MEMORY);
-	ERR_FAIL_COND_V(_out_buf_size && (wslay_event_get_queued_msg_length(_data->ctx) >= (1ULL << _out_buf_size)), ERR_OUT_OF_MEMORY);
+	ERR_FAIL_COND_V(_out_buf_size && (wslay_event_get_queued_msg_length(_data->ctx) + p_buffer_size >= (1ULL << _out_buf_size)), ERR_OUT_OF_MEMORY);
 
-	struct wslay_event_msg msg; // Should I use fragmented?
+	struct wslay_event_msg msg;
 	msg.opcode = write_mode == WRITE_MODE_TEXT ? WSLAY_TEXT_FRAME : WSLAY_BINARY_FRAME;
 	msg.msg = p_buffer;
 	msg.msg_length = p_buffer_size;
 
-	wslay_event_queue_msg(_data->ctx, &msg);
-	if (wslay_event_send(_data->ctx) < 0) {
+	// Queue & send message.
+	if (wslay_event_queue_msg(_data->ctx, &msg) != 0 || wslay_event_send(_data->ctx) != 0) {
 		close_now();
 		return FAILED;
 	}