From 771f1fe5c11416b7e7dec0e56968c227c520aaaa Mon Sep 17 00:00:00 2001 From: Marcin Zawiejski Date: Mon, 30 Jul 2018 09:55:33 +0200 Subject: [PATCH] Fix Windows handles leak Fixes thread and process handles leak when running and killing project from editor (caused by a missing CloseHandle call) plus a potential leak when calling OS_Windows::execute with p_blocking and !r_pipe. The leak could be easily observed with a Handles counter in Task Manager (or Performance Monitor) for the Godot editor process. (cherry picked from commit b1e0da455b2ac9a63e092eacda6927032add8b30) --- platform/windows/os_windows.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 4aa1353c07f..8a54152afbf 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2063,6 +2063,8 @@ Error OS_Windows::execute(const String &p_path, const List &p_arguments, if (r_exitcode) *r_exitcode = ret; + CloseHandle(pi.pi.hProcess); + CloseHandle(pi.pi.hThread); } else { ProcessID pid = pi.pi.dwProcessId; @@ -2076,17 +2078,15 @@ Error OS_Windows::execute(const String &p_path, const List &p_arguments, Error OS_Windows::kill(const ProcessID &p_pid) { - HANDLE h; + ERR_FAIL_COND_V(!process_map->has(p_pid), FAILED); - if (process_map->has(p_pid)) { - h = (*process_map)[p_pid].pi.hProcess; - process_map->erase(p_pid); - } else { + const PROCESS_INFORMATION pi = (*process_map)[p_pid].pi; + process_map->erase(p_pid); - ERR_FAIL_COND_V(!process_map->has(p_pid), FAILED); - }; + const int ret = TerminateProcess(pi.hProcess, 0); - int ret = TerminateProcess(h, 0); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); return ret != 0 ? OK : FAILED; };