FWGS/hlsdk-xash3d
2
0
Fork 0
mirror of https://github.com/FWGS/hlsdk-xash3d synced 2024-11-24 10:50:48 +01:00
Code Issues Projects Releases Wiki Activity

Additional bounds checks on client-side.

Browse Source
This commit is contained in:
Andrey Akhmichin 2024-09-19 01:33:43 +05:00
parent 13a83d12d6
commit c46162469a
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cl_dll/ammo.cpp
View File

@ -647,7 +647,9 @@ int CHudAmmo::MsgFunc_WeaponList( const char *pszName, int iSize, void *pbuf )
WEAPON Weapon;
strcpy( Weapon.szName, READ_STRING() );
strncpy( Weapon.szName, READ_STRING(), sizeof(Weapon.szName) );
Weapon.szName[sizeof(Weapon.szName) - 1] = '\0';
Weapon.iAmmoType = (int)READ_CHAR();
Weapon.iMax1 = READ_BYTE();
@ -665,6 +667,21 @@ int CHudAmmo::MsgFunc_WeaponList( const char *pszName, int iSize, void *pbuf )
Weapon.iFlags = READ_BYTE();
Weapon.iClip = 0;
if( Weapon.iId < 0 || Weapon.iId >= MAX_WEAPONS )
return 0;
if( Weapon.iSlot < 0 || Weapon.iSlot >= MAX_WEAPON_SLOTS + 1 )
return 0;
if( Weapon.iSlotPos < 0 || Weapon.iSlotPos >= MAX_WEAPON_POSITIONS + 1 )
return 0;
if( Weapon.iAmmoType < -1 || Weapon.iAmmoType >= MAX_AMMO_TYPES )
return 0;
if( Weapon.iAmmo2Type < -1 || Weapon.iAmmo2Type >= MAX_AMMO_TYPES )
return 0;
if( Weapon.iAmmoType >= 0 && Weapon.iMax1 == 0 )
return 0;
if( Weapon.iAmmo2Type >= 0 && Weapon.iMax2 == 0 )
return 0;
gWR.AddWeapon( &Weapon );
return 1;

4
cl_dll/hud_spectator.cpp
View File

@ -218,7 +218,9 @@ void UTIL_StringToVector( float * pVector, const char *pString )
char *pstr, *pfront, tempString[128];
int j;
strcpy( tempString, pString );
strncpy( tempString, pString, sizeof( tempString ) );
tempString[sizeof( tempString ) - 1] = '\0';
pstr = pfront = tempString;
for( j = 0; j < 3; j++ )