GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-24 13:55:36 +03:00
Code Issues Projects Releases Wiki Activity

Fixed bad error checking routine

Browse Source
This commit is contained in:
David Anderson 2004-10-04 20:32:26 +00:00
parent 766246648d
commit 77aa0f4f8e
8 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/csx/source/rank.cpp
View File

@ -9,7 +9,7 @@ static cell AMX_NATIVE_CALL get_user_astats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int attacker = params[2]; int attacker = params[2];
CHECK_PLAYER(attacker); CHECK_PLAYERRANGE(attacker);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->attackers[attacker].hits){ if (pPlayer->attackers[attacker].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);
@ -36,7 +36,7 @@ static cell AMX_NATIVE_CALL get_user_vstats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int victim = params[2]; int victim = params[2];
CHECK_PLAYER(victim); CHECK_PLAYERRANGE(victim);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->victims[victim].hits){ if (pPlayer->victims[victim].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);

7
dlls/csx/source/rank.h
View File

@ -125,6 +125,13 @@ bool isModuleActive();
} \ } \
} }
#define CHECK_PLAYERRANGE(x) \
if (x > gpGlobals->maxClients || x < 0) \
{ \
MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
return 0; \
}
#define CHECK_NONPLAYER(x) \ #define CHECK_NONPLAYER(x) \
if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \ if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \
MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \ MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \

4
dlls/dod2/dodx/NRank.cpp
View File

@ -37,7 +37,7 @@ static cell AMX_NATIVE_CALL get_user_astats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int attacker = params[2]; int attacker = params[2];
CHECK_PLAYER(attacker); CHECK_PLAYERRANGE(attacker);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->attackers[attacker].hits){ if (pPlayer->attackers[attacker].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);
@ -64,7 +64,7 @@ static cell AMX_NATIVE_CALL get_user_vstats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int victim = params[2]; int victim = params[2];
CHECK_PLAYER(victim); CHECK_PLAYERRANGE(victim);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->victims[victim].hits){ if (pPlayer->victims[victim].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);

7
dlls/dod2/dodx/dodx.h
View File

@ -140,6 +140,13 @@ edict_t *FindEntityByClassname(edict_t *pentStart, const char *szName);
} \ } \
} }
#define CHECK_PLAYERRANGE(x) \
if (x > gpGlobals->maxClients || x < 0) \
{ \
MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
return 0; \
}
#define CHECK_NONPLAYER(x) \ #define CHECK_NONPLAYER(x) \
if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \ if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \
MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \ MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \

4
dlls/tfc/tfcx/NRank.cpp
View File

@ -38,7 +38,7 @@ static cell AMX_NATIVE_CALL get_user_astats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int attacker = params[2]; int attacker = params[2];
CHECK_PLAYER(attacker); CHECK_PLAYERRANGE(attacker);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->attackers[attacker].hits){ if (pPlayer->attackers[attacker].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);
@ -65,7 +65,7 @@ static cell AMX_NATIVE_CALL get_user_vstats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int victim = params[2]; int victim = params[2];
CHECK_PLAYER(victim); CHECK_PLAYERRANGE(victim);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->victims[victim].hits){ if (pPlayer->victims[victim].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);

7
dlls/tfc/tfcx/tfcx.h
View File

@ -134,6 +134,13 @@ bool util_strncmp( const char *sz1, const char *sz2, int size);
} \ } \
} }
#define CHECK_PLAYERRANGE(x) \
if (x > gpGlobals->maxClients || x < 0) \
{ \
MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
return 0; \
}
#define CHECK_NONPLAYER(x) \ #define CHECK_NONPLAYER(x) \
if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \ if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \
MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \ MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \

4
dlls/ts/tsx/NRank.cpp
View File

@ -38,7 +38,7 @@ static cell AMX_NATIVE_CALL get_user_astats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int attacker = params[2]; int attacker = params[2];
CHECK_PLAYER(attacker); CHECK_PLAYERRANGE(attacker);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->attackers[attacker].hits){ if (pPlayer->attackers[attacker].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);
@ -65,7 +65,7 @@ static cell AMX_NATIVE_CALL get_user_vstats(AMX *amx, cell *params) /* 6 param *
int index = params[1]; int index = params[1];
CHECK_PLAYER(index); CHECK_PLAYER(index);
int victim = params[2]; int victim = params[2];
CHECK_PLAYER(victim); CHECK_PLAYERRANGE(victim);
CPlayer* pPlayer = GET_PLAYER_POINTER_I(index); CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
if (pPlayer->victims[victim].hits){ if (pPlayer->victims[victim].hits){
cell *cpStats = MF_GetAmxAddr(amx,params[3]); cell *cpStats = MF_GetAmxAddr(amx,params[3]);

7
dlls/ts/tsx/tsx.h
View File

@ -148,6 +148,13 @@ bool ignoreBots (edict_t *pEnt, edict_t *pOther = NULL);
} \ } \
} }
#define CHECK_PLAYERRANGE(x) \
if (x > gpGlobals->maxClients || x < 0) \
{ \
MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
return 0; \
}
#define GETEDICT(n) \ #define GETEDICT(n) \
((n >= 1 && n <= gpGlobals->maxClients) ? MF_GetPlayerEdict(n) : INDEXENT(n)) ((n >= 1 && n <= gpGlobals->maxClients) ? MF_GetPlayerEdict(n) : INDEXENT(n))