UNLOZE/sm-ext-dhooks2
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix passing this pointer to callback even if the detour was setup to ignore it

Browse Source 
The this pointer was always passed to the plugin callback if the calling convention was a thiscall. Even if the plugin author set the this pointer type to ThisPointer_Ignore.
This commit is contained in:
Peace-Maker 2018-01-23 13:40:55 +01:00
parent 02e0545d75
commit 2ba221b6a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dynhooks_sourcepawn.cpp
View File

@ -277,7 +277,7 @@ ReturnAction_t HandleDetour(HookType_t hookType, CHook* pDetour)
ke::AutoPtr<void> tempRetBuf(new uint8_t[pDetour->m_pCallingConvention->m_returnType.size]); ke::AutoPtr<void> tempRetBuf(new uint8_t[pDetour->m_pCallingConvention->m_returnType.size]);
// Find the this pointer. // Find the this pointer.
if (pWrapper->callConv == CallConv_THISCALL) if (pWrapper->callConv == CallConv_THISCALL && pWrapper->thisType != ThisPointer_Ignore)
{ {
void *thisPtr = pDetour->GetArgument<void *>(0); void *thisPtr = pDetour->GetArgument<void *>(0);
cell_t thisAddr = GetThisPtr(thisPtr, pWrapper->thisType); cell_t thisAddr = GetThisPtr(thisPtr, pWrapper->thisType);