Skip to content

Fix: Drop non-pseudo handles to current thread in DetourUpdateThread #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sylveon wants to merge 5 commits into from
Closed

Fix: Drop non-pseudo handles to current thread in DetourUpdateThread #80

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a2dfa8
Drop non-pseudo handles to current thread in DetourUpdateThread
sylveon Aug 26, 2019
5ae84a1
Merge branch 'master' of https://github.com/microsoft/Detours into up…
sylveon Mar 8, 2021
cf6d4c6
Support Windows XP :(
sylveon Mar 8, 2021
399dddc
Revert drive-by fix for #141
sylveon Mar 8, 2021
f3fc4d9
Update debug strings
sylveon Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/detours.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,6 +1924,35 @@ typedef ULONG_PTR DETOURS_EIP_TYPE;
return s_nPendingError;
}

static bool IsCurrentThread(_In_ HANDLE hThread)
{
if (hThread == GetCurrentThread()) {
return true;
}

#if (_WIN32_WINNT >= 0x0502)
return GetThreadId(hThread) == GetCurrentThreadId();
#else
typedef DWORD(WINAPI *LPFN_GETTHREADID)(HANDLE);

// GetThreadId is not available on all supported versions of Windows.
HMODULE hKernel32 = GetModuleHandleW(L"KERNEL32.DLL");
if (hKernel32 == NULL) {
DETOUR_TRACE(("GetModuleHandleW failed: %lu\n", GetLastError()));
return false;
}

LPFN_GETTHREADID pfnGetThreadId = (LPFN_GETTHREADID)GetProcAddress(
hKernel32, "GetThreadId");

if (pfnGetThreadId == NULL) {
DETOUR_TRACE(("GetProcAddress failed: %lu\n", GetLastError()));
return false;
}
return pfnGetThreadId(hThread) == GetCurrentThreadId();
#endif
}

LONG WINAPI DetourUpdateThread(_In_ HANDLE hThread)
{
LONG error;
Expand All @@ -1934,7 +1963,7 @@ LONG WINAPI DetourUpdateThread(_In_ HANDLE hThread)
}

// Silently (and safely) drop any attempt to suspend our own thread.
if (hThread == GetCurrentThread()) {
if (IsCurrentThread(hThread)) {
return NO_ERROR;
}

Expand Down