R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do proper checks if Client Instance is valid

Browse Source
This commit is contained in:
PixieCore 2022-07-07 20:35:49 +02:00
parent ac55e6c142
commit 0463647268
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
r5dev/public/bansystem.cpp
View File

@ -170,18 +170,16 @@ void CBanSystem::BanListCheck(void)
{ {
for (int c = 0; c < MAX_PLAYERS; c++) // Loop through all possible client instances. for (int c = 0; c < MAX_PLAYERS; c++) // Loop through all possible client instances.
{ {
CClient* pClient = g_pClient->GetClient(c); CClient* pClient = g_pClient->GetClient(i);
CNetChan* pNetChan = pClient->GetNetChan(); if (!pClient)
continue;
if (!pClient || !pNetChan)
{ CNetChan* pNetChan = pClient->GetNetChan();
if (!pNetChan)
continue; continue;
}
if (pClient->GetOriginID() != m_vRefuseList[i].second) if (pClient->GetOriginID() != m_vRefuseList[i].second)
{
continue; continue;
}
string svIpAddress = pNetChan->GetAddress(); string svIpAddress = pNetChan->GetAddress();

39
r5dev/vstdlib/callback.cpp
View File

@ -80,11 +80,12 @@ void Host_Kick_f(const CCommand& args)
for (int i = 0; i < MAX_PLAYERS; i++) for (int i = 0; i < MAX_PLAYERS; i++)
{ {
CClient* pClient = g_pClient->GetClient(i); CClient* pClient = g_pClient->GetClient(i);
CNetChan* pNetChan = pClient->GetNetChan(); if (!pClient)
if (!pClient || !pNetChan) continue;
{
CNetChan* pNetChan = pClient->GetNetChan();
if (!pNetChan)
continue; continue;
}
string svClientName = pNetChan->GetName(); // Get full name. string svClientName = pNetChan->GetName(); // Get full name.
@ -120,12 +121,12 @@ void Host_KickID_f(const CCommand& args)
for (int i = 0; i < MAX_PLAYERS; i++) for (int i = 0; i < MAX_PLAYERS; i++)
{ {
CClient* pClient = g_pClient->GetClient(i); CClient* pClient = g_pClient->GetClient(i);
CNetChan* pNetChan = pClient->GetNetChan(); if (!pClient)
continue;
if (!pClient || !pNetChan)
{ CNetChan* pNetChan = pClient->GetNetChan();
if (!pNetChan)
continue; continue;
}
string svIpAddress = pNetChan->GetAddress(); // If this stays null they modified the packet somehow. string svIpAddress = pNetChan->GetAddress(); // If this stays null they modified the packet somehow.
@ -184,12 +185,12 @@ void Host_Ban_f(const CCommand& args)
for (int i = 0; i < MAX_PLAYERS; i++) for (int i = 0; i < MAX_PLAYERS; i++)
{ {
CClient* pClient = g_pClient->GetClient(i); CClient* pClient = g_pClient->GetClient(i);
CNetChan* pNetChan = pClient->GetNetChan(); if (!pClient)
continue;
if (!pClient || !pNetChan)
{ CNetChan* pNetChan = pClient->GetNetChan();
if (!pNetChan)
continue; continue;
}
string svClientName = pNetChan->GetName(); // Get full name. string svClientName = pNetChan->GetName(); // Get full name.
@ -229,12 +230,12 @@ void Host_BanID_f(const CCommand& args)
for (int i = 0; i < MAX_PLAYERS; i++) for (int i = 0; i < MAX_PLAYERS; i++)
{ {
CClient* pClient = g_pClient->GetClient(i); CClient* pClient = g_pClient->GetClient(i);
CNetChan* pNetChan = pClient->GetNetChan(); if (!pClient)
continue;
if (!pClient || !pNetChan)
{ CNetChan* pNetChan = pClient->GetNetChan();
if (!pNetChan)
continue; continue;
}
string svIpAddress = pNetChan->GetAddress(); // If this stays empty they modified the packet somehow. string svIpAddress = pNetChan->GetAddress(); // If this stays empty they modified the packet somehow.