mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

On Windows, terminate processes by handle, not pid

Browse source 
When we create a process yourself with CreateProcess, we get a
handle to the process in the PROCESS_INFO output structure.  But
instead of using that handle, we were manually looking up a _new_
handle based on the process ID, which is a poor idea, since the
process ID might refer to a new process later on, but the handle
can't.
This commit is contained in:
Nick Mathewson 2014-04-10 11:16:42 -04:00
parent f8344c2d28
commit 34f8723dc7
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/util.c
View file

@ -3629,13 +3629,7 @@ tor_terminate_process(process_handle_t *process_handle)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (tor_get_exit_code(process_handle, 0, NULL) == PROCESS_EXIT_RUNNING) { if (tor_get_exit_code(process_handle, 0, NULL) == PROCESS_EXIT_RUNNING) {
HANDLE handle; HANDLE handle = process_handle->pid.hProcess;
/* If the signal is outside of what GenerateConsoleCtrlEvent can use,
attempt to open and terminate the process. */
handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE,
process_handle->pid.dwProcessId);
if (!handle)
return -1;
if (!TerminateProcess(handle, 0)) if (!TerminateProcess(handle, 0))
return -1; return -1;