reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-05 19:45:33 +03:00
Code Issues Projects Releases Wiki Activity

Update sv_user.cpp

Browse Source
This commit is contained in:
pepepepito0147 2022-09-09 19:23:29 -04:00 committed by GitHub
parent d1529e3e88
commit 2cd2185510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rehlds/engine/sv_user.cpp
View File

@ -94,16 +94,13 @@ void SV_ParseConsistencyResponse(client_t *pSenderClient)
Q_memset(nullbuffer, 0, sizeof(nullbuffer)); Q_memset(nullbuffer, 0, sizeof(nullbuffer));
int value = MSG_ReadShort(); int value = MSG_ReadShort();
if (sv_invalid_length.value) if (sv_invalid_length.value || value <= 0 || !SZ_HasSomethingToRead(&net_message, value))
{
if (value <= 0 || !SZ_HasSomethingToRead(&net_message, value))
{ {
msg_badread = TRUE; msg_badread = TRUE;
Con_DPrintf("%s: %s:%s invalid length: %d\n", __func__, host_client->name, NET_AdrToString(host_client->netchan.remote_address), value); Con_DPrintf("%s: %s:%s invalid length: %d\n", __func__, host_client->name, NET_AdrToString(host_client->netchan.remote_address), value);
SV_DropClient(host_client, FALSE, "Invalid length"); SV_DropClient(host_client, FALSE, "Invalid length");
return; return;
} }
}
COM_UnMunge(&net_message.data[msg_readcount], value, g_psvs.spawncount); COM_UnMunge(&net_message.data[msg_readcount], value, g_psvs.spawncount);
MSG_StartBitReading(&net_message); MSG_StartBitReading(&net_message);
@ -1575,16 +1572,13 @@ void SV_ParseMove(client_t *pSenderClient)
mlen = MSG_ReadByte(); mlen = MSG_ReadByte();
cbchecksum = MSG_ReadByte(); cbchecksum = MSG_ReadByte();
if (sv_invalid_length.value) if (sv_invalid_length.value || mlen <= 0 || !SZ_HasSpaceToRead(&net_message, mlen))
{
if (mlen <= 0 || !SZ_HasSpaceToRead(&net_message, mlen))
{ {
msg_badread = TRUE; msg_badread = TRUE;
Con_DPrintf("%s: %s:%s invalid length: %d\n", __func__, host_client->name, NET_AdrToString(host_client->netchan.remote_address), mlen); Con_DPrintf("%s: %s:%s invalid length: %d\n", __func__, host_client->name, NET_AdrToString(host_client->netchan.remote_address), mlen);
SV_DropClient(host_client, FALSE, "Invalid length"); SV_DropClient(host_client, FALSE, "Invalid length");
return; return;
} }
}
COM_UnMunge(&net_message.data[placeholder + 1], mlen, host_client->netchan.incoming_sequence); COM_UnMunge(&net_message.data[placeholder + 1], mlen, host_client->netchan.incoming_sequence);
@ -1813,13 +1807,10 @@ void EXT_FUNC SV_HandleClientMessage_api(IGameClient* client, uint8 opcode) {
func(cl); func(cl);
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
if (msg_badread) if (msg_badread || sv_msg_badread.value)
{
if (sv_msg_badread.value)
{ {
Con_Printf("SV_ReadClientMessage: badread on %s, opcode %s\n", name, sv_clcfuncs[opcode].pszname); Con_Printf("SV_ReadClientMessage: badread on %s, opcode %s\n", name, sv_clcfuncs[opcode].pszname);
} }
}
#endif #endif
} }
@ -1844,21 +1835,15 @@ void SV_ExecuteClientMessage(client_t *cl)
while (1) while (1)
{ {
if (msg_badread) if (msg_badread || sv_msg_badread.value)
{ {
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
if (sv_msg_badread.value)
{
Con_Printf("SV_ReadClientMessage: badread on %s\n", host_client->name); Con_Printf("SV_ReadClientMessage: badread on %s\n", host_client->name);
}
if (host_client->active) if (host_client->active)
SV_ClientPrintf("Badread\n"); SV_ClientPrintf("Badread\n");
#else // REHLDS_FIXES #else // REHLDS_FIXES
if (sv_msg_badread.value)
{
Con_Printf("SV_ReadClientMessage: badread\n"); Con_Printf("SV_ReadClientMessage: badread\n");
}
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
return; return;
} }