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

DHooks: Error on argument passflags for detours (#1773)

Browse Source 
The passflags are only supported by SourceHook for virtual hooks and are ignored for detours with DynamicDetours. This caused confusion, so throw an error when trying to set e.g. the DHookPass_ByRef flag on detour arguments.
This commit is contained in:
peace-maker 2022-05-31 14:58:36 +02:00 committed by GitHub
parent c92354debb
commit 7424deefb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/dhooks/natives.cpp
View File

@ -256,6 +256,15 @@ cell_t Native_SetFromConf(IPluginContext *pContext, const cell_t *params)
setup->funcAddr = addr;
setup->offset = offset;
if (addr == nullptr)
{
setup->hookMethod = Virtual;
}
else
{
setup->hookMethod = Detour;
}
return 1;
}
@ -282,6 +291,13 @@ cell_t Native_AddParam(IPluginContext *pContext, const cell_t *params)
info.flags = PASSFLAG_BYVAL;
}
// DynamicDetours doesn't expose the passflags concept like SourceHook.
// See if we're trying to set some invalid flags on detour arguments.
if(setup->hookMethod == Detour && (info.flags & ~PASSFLAG_BYVAL) > 0)
{
return pContext->ThrowNativeError("Pass flags are only supported for virtual hooks.");
}
if (params[0] >= 5)
{
PluginRegister custom_register = (PluginRegister)params[5];

14
extensions/dhooks/signatures.cpp
View File

@ -376,6 +376,20 @@ SMCResult SignatureGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
return SMCResult_HaltFail;
}
if (!g_CurrentSignature->offset.length())
{
// DynamicDetours doesn't expose the passflags concept like SourceHook.
// See if we're trying to set some invalid flags on detour arguments.
for (auto &arg : g_CurrentSignature->args)
{
if ((arg.info.flags & ~PASSFLAG_BYVAL) > 0)
{
smutils->LogError(myself, "Function \"%s\" uses unsupported pass flags in argument \"%s\". Flags are only supported for virtual hooks: line: %i col: %i", g_CurrentFunctionName.c_str(), arg.name.c_str(), states->line, states->col);
return SMCResult_HaltFail;
}
}
}
// Save this function signature in our cache.
signatures_.insert(g_CurrentFunctionName.c_str(), g_CurrentSignature);
g_CurrentFunctionName = "";

8
extensions/dhooks/vhook.h
View File

@ -225,6 +225,11 @@ public:
DHooksInfo *dg;
};
enum HookMethod {
Virtual,
Detour
};
class HookSetup
{
public:
@ -238,6 +243,7 @@ public:
this->offset = offset;
this->funcAddr = nullptr;
this->callback = callback;
this->hookMethod = Virtual;
};
HookSetup(ReturnType returnType, unsigned int returnFlag, CallingConvention callConv, ThisPointerType thisType, void *funcAddr)
{
@ -249,6 +255,7 @@ public:
this->offset = -1;
this->funcAddr = funcAddr;
this->callback = nullptr;
this->hookMethod = Detour;
};
~HookSetup(){};
@ -266,6 +273,7 @@ public:
int offset;
void *funcAddr;
IPluginFunction *callback;
HookMethod hookMethod;
};
class DHooksManager