UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SDKHooks hook ent validation missing first datatable name (bug 5881, r=asherkin).

Browse Source
This commit is contained in:
Nicholas Hastings 2013-08-24 21:59:52 -04:00
parent 9bf78a96cc
commit 96e971084a
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/sdkhooks/extension.cpp
View File

@ -525,11 +525,10 @@ HookReturn SDKHooks::Hook(int entity, SDKHookType type, IPluginFunction *callbac
if (!!strcmp(g_HookTypes[type].dtReq, "")) if (!!strcmp(g_HookTypes[type].dtReq, ""))
{ {
sm_sendprop_info_t spi;
IServerUnknown *pUnk = (IServerUnknown *)pEnt; IServerUnknown *pUnk = (IServerUnknown *)pEnt;
IServerNetworkable *pNet = pUnk->GetNetworkable(); IServerNetworkable *pNet = pUnk->GetNetworkable();
if (pNet && !UTIL_FindDataTable(pNet->GetServerClass()->m_pTable, g_HookTypes[type].dtReq, &spi, 0)) if (pNet && !UTIL_ContainsDataTable(pNet->GetServerClass()->m_pTable, g_HookTypes[type].dtReq))
return HookRet_BadEntForHookType; return HookRet_BadEntForHookType;
} }

4
extensions/sdkhooks/natives.cpp
View File

@ -190,13 +190,13 @@ cell_t Native_DropWeapon(IPluginContext *pContext, const cell_t *params)
if (!pWeapon) if (!pWeapon)
return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]); return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]);
sm_sendprop_info_t spi;
IServerUnknown *pUnk = (IServerUnknown *)pWeapon; IServerUnknown *pUnk = (IServerUnknown *)pWeapon;
IServerNetworkable *pNet = pUnk->GetNetworkable(); IServerNetworkable *pNet = pUnk->GetNetworkable();
if (!UTIL_FindDataTable(pNet->GetServerClass()->m_pTable, "DT_BaseCombatWeapon", &spi, 0)) if (!UTIL_ContainsDataTable(pNet->GetServerClass()->m_pTable, "DT_BaseCombatWeapon"))
return pContext->ThrowNativeError("Entity index %d is not a weapon", params[2]); return pContext->ThrowNativeError("Entity index %d is not a weapon", params[2]);
sm_sendprop_info_t spi;
if (!gamehelpers->FindSendPropInfo("CBaseCombatWeapon", "m_hOwnerEntity", &spi)) if (!gamehelpers->FindSendPropInfo("CBaseCombatWeapon", "m_hOwnerEntity", &spi))
return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]); return pContext->ThrowNativeError("Invalid entity index %d for weapon", params[2]);

18
extensions/sdkhooks/util.cpp
View File

@ -64,16 +64,16 @@ CBaseEntity *UTIL_GetCBaseEntity(int num, bool onlyPlayers)
return pUnk->GetBaseEntity(); return pUnk->GetBaseEntity();
} }
bool UTIL_FindDataTable(SendTable *pTable, bool UTIL_ContainsDataTable(SendTable *pTable, const char *name)
const char *name,
sm_sendprop_info_t *info,
unsigned int offset)
{ {
const char *pname; const char *pname = pTable->GetName();
int props = pTable->GetNumProps(); int props = pTable->GetNumProps();
SendProp *prop; SendProp *prop;
SendTable *table; SendTable *table;
if (pname && strcmp(name, pname) == 0)
return true;
for (int i=0; i<props; i++) for (int i=0; i<props; i++)
{ {
prop = pTable->GetProp(i); prop = pTable->GetProp(i);
@ -83,16 +83,10 @@ bool UTIL_FindDataTable(SendTable *pTable,
pname = table->GetName(); pname = table->GetName();
if (pname && strcmp(name, pname) == 0) if (pname && strcmp(name, pname) == 0)
{ {
info->prop = prop;
info->actual_offset = offset + info->prop->GetOffset();
return true; return true;
} }
if (UTIL_FindDataTable(table, if (UTIL_ContainsDataTable(table, name))
name,
info,
offset + prop->GetOffset())
)
{ {
return true; return true;
} }

2
extensions/sdkhooks/util.h
View File

@ -35,6 +35,6 @@
#include <compat_wrappers.h> #include <compat_wrappers.h>
CBaseEntity *UTIL_GetCBaseEntity(int num, bool onlyPlayers=false); CBaseEntity *UTIL_GetCBaseEntity(int num, bool onlyPlayers=false);
bool UTIL_FindDataTable(SendTable *pTable, const char *name, sm_sendprop_info_t *info, unsigned int offset); bool UTIL_ContainsDataTable(SendTable *pTable, const char *name);
#endif //_INCLUDE_TF2TOOLS_UTIL_H_ #endif //_INCLUDE_TF2TOOLS_UTIL_H_