reHLDS/reapi
2
0
Fork 0
mirror of https://github.com/rehlds/reapi.git synced 2025-01-14 15:48:03 +03:00
Code Issues Projects Releases Wiki Activity

set_member: more details for entity checking

Browse Source 
fix validating for AMX_NULLENT index
This commit is contained in:
s1lentq 2024-08-27 22:10:00 +07:00
parent 22761b7ff9
commit a76c872953
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reapi/src/natives/natives_helper.h
View File

@ -11,7 +11,7 @@
#define CHECK_INSTANCE_OF(x, y) if (unlikely(dynamic_cast<x *>((x::BaseClass *)y) == nullptr)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid entity %d ('%s'), is not an instance of the base class '%s'", __FUNCTION__, indexOfEdict(y->pev), STRING(y->pev->classname), #x); return FALSE; } #define CHECK_INSTANCE_OF(x, y) if (unlikely(dynamic_cast<x *>((x::BaseClass *)y) == nullptr)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid entity %d ('%s'), is not an instance of the base class '%s'", __FUNCTION__, indexOfEdict(y->pev), STRING(y->pev->classname), #x); return FALSE; }
#define CHECK_REQUIREMENTS(x) if (unlikely(!api_cfg.has##x())) { AMXX_LogError(amx, AMX_ERR_NATIVE, "Native '%s' is not available, %s required.", __FUNCTION__, #x); return FALSE; } if (!g_RehldsMessageManager) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: %s message manager not initialized.", __FUNCTION__, #x); return FALSE; } #define CHECK_REQUIREMENTS(x) if (unlikely(!api_cfg.has##x())) { AMXX_LogError(amx, AMX_ERR_NATIVE, "Native '%s' is not available, %s required.", __FUNCTION__, #x); return FALSE; } if (!g_RehldsMessageManager) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: %s message manager not initialized.", __FUNCTION__, #x); return FALSE; }
#define ENTITY_VALIDATE(x) if (unlikely(x < 0 || x > gpGlobals->maxEntities)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: invalid entity index %i", __FUNCTION__, x); return FALSE; } #define AMX_ENTITY_VALIDATE(x, y) if (unlikely(x < AMX_NULLENT || x > gpGlobals->maxEntities)) { AMXX_LogError(amx, AMX_ERR_NATIVE, "%s: \"%s\" invalid entity index %i", __FUNCTION__, y, x); return FALSE; }
class CAmxArg class CAmxArg
{ {

8
reapi/src/natives/natives_members.cpp
View File

@ -939,7 +939,7 @@ cell set_member(AMX *amx, void* pdata, const member_t *member, cell* value, size
switch (member->type) { switch (member->type) {
case MEMBER_CLASSPTR: case MEMBER_CLASSPTR:
{ {
ENTITY_VALIDATE(*value); AMX_ENTITY_VALIDATE(*value, member->name);
// native set_member(_index, any:_member, _value, _elem); // native set_member(_index, any:_member, _value, _elem);
CBaseEntity *pEntity = getPrivate<CBaseEntity>(*value); CBaseEntity *pEntity = getPrivate<CBaseEntity>(*value);
set_member<CBaseEntity *>(pdata, member->offset, pEntity, element); set_member<CBaseEntity *>(pdata, member->offset, pEntity, element);
@ -947,7 +947,7 @@ cell set_member(AMX *amx, void* pdata, const member_t *member, cell* value, size
} }
case MEMBER_EHANDLE: case MEMBER_EHANDLE:
{ {
ENTITY_VALIDATE(*value); AMX_ENTITY_VALIDATE(*value, member->name);
// native set_member(_index, any:_member, _value, _elem); // native set_member(_index, any:_member, _value, _elem);
EHANDLE& ehandle = get_member<EHANDLE>(pdata, member->offset, element); EHANDLE& ehandle = get_member<EHANDLE>(pdata, member->offset, element);
edict_t *pEdictValue = edictByIndexAmx(*value); edict_t *pEdictValue = edictByIndexAmx(*value);
@ -956,7 +956,7 @@ cell set_member(AMX *amx, void* pdata, const member_t *member, cell* value, size
} }
case MEMBER_EDICT: case MEMBER_EDICT:
{ {
ENTITY_VALIDATE(*value); AMX_ENTITY_VALIDATE(*value, member->name);
// native set_member(_index, any:_member, _value, _elem); // native set_member(_index, any:_member, _value, _elem);
edict_t *pEdictValue = edictByIndexAmx(*value); edict_t *pEdictValue = edictByIndexAmx(*value);
set_member<edict_t *>(pdata, member->offset, pEdictValue, element); set_member<edict_t *>(pdata, member->offset, pEdictValue, element);
@ -964,7 +964,7 @@ cell set_member(AMX *amx, void* pdata, const member_t *member, cell* value, size
} }
case MEMBER_EVARS: case MEMBER_EVARS:
{ {
ENTITY_VALIDATE(*value); AMX_ENTITY_VALIDATE(*value, member->name);
// native set_member(_index, any:_member, _value, _elem); // native set_member(_index, any:_member, _value, _elem);
entvars_t *pev = PEV(*value); entvars_t *pev = PEV(*value);
set_member<entvars_t *>(pdata, member->offset, pev, element); set_member<entvars_t *>(pdata, member->offset, pev, element);