smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#6567 Fixed memory leak causing zombie handles to created in the deamon on windows

Browse source 
Capture all process information as they are created to properly kill off handles when process are stopped, also added in a kill everything when the program cleans up all synergy(s|c) processes
This commit is contained in:
Jamie Newbon 2020-09-08 12:15:06 +01:00
parent af63aab1e0
commit f25947e68b
2 changed files with 63 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/lib/platform/MSWindowsWatchdog.cpp
View file

@ -37,6 +37,7 @@
#include <UserEnv.h>
#include <Shellapi.h>
#define CURRENT_PROCESS_ID 0
#define MAXIMUM_WAIT_TIME 3
enum {
kOutputBufferSize = 4096
@ -338,6 +339,7 @@ MSWindowsWatchdog::startProcess()
// wait for program to fail.
ARCH->sleep(1);
if (!isProcessActive()) {
closeProcessHandles(m_processInfo.dwProcessId);
throw XMSWindowsWatchdogError("process immediately stopped");
}
@ -376,9 +378,13 @@ MSWindowsWatchdog::startProcessInForeground(String& command)
si.dwFlags |= STARTF_USESHOWWINDOW;
si.wShowWindow = SW_MINIMIZE;
return CreateProcess(
BOOL result = CreateProcess(
NULL, LPSTR(command.c_str()), NULL, NULL,
TRUE, 0, NULL, NULL, &si, &m_processInfo);
m_children.insert(std::make_pair(m_processInfo.dwProcessId, m_processInfo));
return result;
}
BOOL
@ -409,6 +415,8 @@ MSWindowsWatchdog::startProcessAsUser(String& command, HANDLE userToken, LPSECUR
sa, NULL, TRUE, creationFlags,
environment, NULL, &si, &m_processInfo);
m_children.insert(std::make_pair(m_processInfo.dwProcessId, m_processInfo));
DestroyEnvironmentBlock(environment);
CloseHandle(userToken);
@ -529,13 +537,15 @@ MSWindowsWatchdog::shutdownProcess(HANDLE handle, DWORD pid, int timeout)
ARCH->sleep(1);
}
}
closeProcessHandles(pid);
}
void
MSWindowsWatchdog::shutdownExistingProcesses()
{
// first we need to take a snapshot of the running processes
HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, CURRENT_PROCESS_ID);
if (snapshot == INVALID_HANDLE_VALUE) {
LOG((CLOG_ERR "could not get process snapshot"));
throw XArch(new XArchEvalWindows);
@ -581,6 +591,7 @@ MSWindowsWatchdog::shutdownExistingProcesses()
}
}
clearAllChildren();
CloseHandle(snapshot);
m_processRunning = false;
}
@ -601,7 +612,7 @@ MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security)
m_elevateProcess = elevateProcess;
BOOL createRet = startProcessAsUser(syntoolCommand, userToken, security);
auto pid = m_processInfo.dwProcessId;
if (!createRet) {
DWORD rc = GetLastError();
RevertToSelf();
@ -622,6 +633,7 @@ MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security)
}
m_ready = false;
ARCH->unlockMutex(m_mutex);
closeProcessHandles(pid);
}
}
@ -644,3 +656,22 @@ MSWindowsWatchdog::testOutput(String buffer)
ARCH->unlockMutex(m_mutex);
}
}
void MSWindowsWatchdog::closeProcessHandles(unsigned long pid, bool removeFromMap) {
auto processInfo = m_children.find(pid);
if (processInfo != m_children.end()) {
CloseHandle(processInfo->second.hProcess);
CloseHandle(processInfo->second.hThread);
if(removeFromMap) {
m_children.erase(processInfo);
}
}
}
void MSWindowsWatchdog::clearAllChildren() {
for (auto it = m_children.begin(); it != m_children.end(); ++it)
{
closeProcessHandles(it->second.dwThreadId, false);
}
m_children.clear();
}

41
src/lib/platform/MSWindowsWatchdog.h
View file

@ -26,6 +26,7 @@
#include <Windows.h>
#include <string>
#include <list>
#include <map>
class Thread;
class IpcLogOutputter;
@ -42,7 +43,7 @@ public:
virtual ~MSWindowsWatchdog();
void startAsync();
std::string getCommand() const;
std::string getCommand() const;
void setCommand(const std::string& command, bool elevate);
void stop();
bool isProcessActive();
@ -53,8 +54,8 @@ private:
void outputLoop(void*);
void shutdownProcess(HANDLE handle, DWORD pid, int timeout);
void shutdownExistingProcesses();
HANDLE duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTES security);
HANDLE getUserToken(LPSECURITY_ATTRIBUTES security);
HANDLE duplicateProcessToken(HANDLE process, LPSECURITY_ATTRIBUTES security);
HANDLE getUserToken(LPSECURITY_ATTRIBUTES security);
void startProcess();
BOOL startProcessAsUser(String& command, HANDLE userToken, LPSECURITY_ATTRIBUTES sa);
BOOL startProcessInForeground(String& command);
@ -62,29 +63,45 @@ private:
void getActiveDesktop(LPSECURITY_ATTRIBUTES security);
void testOutput(String buffer);
void setStartupInfo(STARTUPINFO& si);
void checkChildren();
/**
* @brief This closes the handles held to a child thread
* @param pid the ID of the process to kill, will do nothing if PID is not a valid child
* @param removeFromMap should the function remove the item from the children map
*/
void closeProcessHandles(unsigned long pid, bool removeFromMap = true);
/**
* @brief This kills off all children's handles created by this process
*/
void clearAllChildren();
private:
Thread* m_thread;
Thread* m_thread;
bool m_autoDetectCommand;
std::string m_command;
std::string m_command;
bool m_monitoring;
bool m_commandChanged;
HANDLE m_stdOutWrite;
HANDLE m_stdOutRead;
Thread* m_outputThread;
IpcServer& m_ipcServer;
HANDLE m_stdOutWrite;
HANDLE m_stdOutRead;
Thread* m_outputThread;
IpcServer& m_ipcServer;
IpcLogOutputter& m_ipcLogOutputter;
bool m_elevateProcess;
MSWindowsSession m_session;
PROCESS_INFORMATION m_processInfo;
int m_processFailures;
int m_processFailures;
bool m_processRunning;
FileLogOutputter* m_fileLogOutputter;
FileLogOutputter* m_fileLogOutputter;
bool m_autoElevated;
ArchMutex m_mutex;
ArchMutex m_mutex;
ArchCond m_condVar;
bool m_ready;
bool m_foreground;
/// @brief Save the info of all process made
/// We will use this to track all processes we make and
/// kill off handels and children that we no longer need
std::map<unsigned long, PROCESS_INFORMATION> m_children;
};
//! Relauncher error