RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: common: xrcon: fix potential overflow and another recursion case

Browse Source
This commit is contained in:
Alibek Omarov
2026-05-30 04:07:40 +05:00
parent 2c0c20dfe6
commit 648db4a2b3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/common/xrcon.c
View File

@@ -144,8 +144,9 @@ static qboolean XRcon_SendPacket( const char *type, const void *body, size_t bod
int err = WSAGetLastError(); int err = WSAGetLastError();
if( err != WSAEWOULDBLOCK && err != WSAEALREADY ) if( err != WSAEWOULDBLOCK && err != WSAEALREADY )
{ {
Con_Printf( S_ERROR "%s: send error %s\n", __func__, NET_ErrorString( )); const char *errstr = NET_ErrorString();
XRcon_DisconnectClient(); XRcon_DisconnectClient();
Con_Printf( S_ERROR "%s: send error %s\n", __func__, errstr );
return false; return false;
} }
sent = 0; sent = 0;
@@ -157,8 +158,8 @@ static qboolean XRcon_SendPacket( const char *type, const void *body, size_t bod
size_t available = sizeof( xrcon.tx_buffer ) - xrcon.tx_pos; size_t available = sizeof( xrcon.tx_buffer ) - xrcon.tx_pos;
if( available < unsent ) if( available < unsent )
{ {
Con_Printf( S_ERROR "%s: transmit buffer overflow\n", __func__ );
XRcon_DisconnectClient(); XRcon_DisconnectClient();
Con_Printf( S_ERROR "%s: transmit buffer overflow\n", __func__ );
return false; return false;
} }
@@ -335,7 +336,7 @@ static void XRcon_ProcessRxData( void )
{ {
char cmd[XRCON_MAX_FRAME_SIZE]; char cmd[XRCON_MAX_FRAME_SIZE];
size_t cmd_len = Q_min( payload_length, sizeof( cmd ) - 1 ); size_t cmd_len = Q_min( payload_length, sizeof( cmd ) - 1 );
memcpy( cmd, xrcon.rx_buffer, payload_length ); memcpy( cmd, xrcon.rx_buffer, cmd_len );
cmd[cmd_len] = '\0'; cmd[cmd_len] = '\0';
XRcon_HandleCMND( cmd ); XRcon_HandleCMND( cmd );
} }