Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
- Fix LoaderLock assert in TerminateThread. Spotted by Amine

svn path=/trunk/; revision=59992
This commit is contained in:
Thomas Faber 2013-09-04 19:53:59 +00:00
parent 37c514e37f
commit 903ab584cf
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/kernel32/client/thread.c
View file

@ -571,8 +571,10 @@ TerminateThread(IN HANDLE hThread,
IN DWORD dwExitCode) IN DWORD dwExitCode)
{ {
NTSTATUS Status; NTSTATUS Status;
#if DBG
PRTL_CRITICAL_SECTION LoaderLock; PRTL_CRITICAL_SECTION LoaderLock;
THREAD_BASIC_INFORMATION ThreadInfo; THREAD_BASIC_INFORMATION ThreadInfo;
#endif /* DBG */
/* Check for invalid thread handle */ /* Check for invalid thread handle */
if (!hThread) if (!hThread)
@ -582,6 +584,7 @@ TerminateThread(IN HANDLE hThread,
return FALSE; return FALSE;
} }
#if DBG
/* Get the loader lock */ /* Get the loader lock */
LoaderLock = NtCurrentPeb()->LoaderLock; LoaderLock = NtCurrentPeb()->LoaderLock;
if (LoaderLock) if (LoaderLock)
@ -592,13 +595,14 @@ TerminateThread(IN HANDLE hThread,
&ThreadInfo, &ThreadInfo,
sizeof(ThreadInfo), sizeof(ThreadInfo),
NULL); NULL);
if (!NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
/* Assert that we don't hold the loader lock */ /* If terminating the current thread, we must not hold the loader lock */
ASSERT(NtCurrentTeb()->ClientId.UniqueThread != ThreadInfo.ClientId.UniqueThread); if (NtCurrentTeb()->ClientId.UniqueThread == ThreadInfo.ClientId.UniqueThread)
ASSERT(NtCurrentTeb()->ClientId.UniqueThread != LoaderLock->OwningThread); ASSERT(NtCurrentTeb()->ClientId.UniqueThread != LoaderLock->OwningThread);
} }
} }
#endif /* DBG */
/* Now terminate the thread */ /* Now terminate the thread */
Status = NtTerminateThread(hThread, dwExitCode); Status = NtTerminateThread(hThread, dwExitCode);