generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 02:06:04 +02:00
Code Issues Projects Releases Wiki Activity

Don't call CloseHandle() twice on Windows (as it causes crashes, or unexpected behavior). This would happen with the following test case:

Browse Source 
ProcessHandle handle = Process.launch(...);
handle.kill();
Then as handle gets out of scope, ~ProcessHandle would call CloseHandle() on an already closed handle.
This commit is contained in:
Patrice Tarabbia
2013-05-01 06:41:45 -04:00
parent e06fec0e24
commit c59f8865ac
14 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/include/Poco/Process.h
View File

@@ -237,7 +237,7 @@ public:
/// Waits for the process specified by handle to terminate
/// and returns the exit code of the process.
static void kill(const ProcessHandle& handle);
static void kill(ProcessHandle& handle);
/// Kills the process specified by handle.
///
/// This is preferable on Windows where process IDs

2
Foundation/include/Poco/Process_UNIX.h
View File

@@ -84,7 +84,7 @@ public:
Pipe* outPipe,
Pipe* errPipe,
const EnvImpl& env);
static void killImpl(const ProcessHandleImpl& handle);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);

2
Foundation/include/Poco/Process_VMS.h
View File

@@ -85,7 +85,7 @@ public:
Pipe* errPipe,
const EnvImpl& env);
static int waitImpl(PIDImpl pid);
static void killImpl(const ProcessHandleImpl& handle);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);
};

2
Foundation/include/Poco/Process_VX.h
View File

@@ -86,7 +86,7 @@ public:
Pipe* outPipe,
Pipe* errPipe,
const EnvImpl& env);
static void killImpl(const ProcessHandleImpl& handle);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);
};

5
Foundation/include/Poco/Process_WIN32.h
View File

@@ -62,7 +62,8 @@ public:
UInt32 id() const;
HANDLE process() const;
int wait() const;
void closeHandle();
private:
HANDLE _hProcess;
UInt32 _pid;
@@ -89,7 +90,7 @@ public:
Pipe* outPipe,
Pipe* errPipe,
const EnvImpl& env);
static void killImpl(const ProcessHandleImpl& handle);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);
static std::string terminationEventName(PIDImpl pid);

3
Foundation/include/Poco/Process_WIN32U.h
View File

@@ -62,6 +62,7 @@ public:
UInt32 id() const;
HANDLE process() const;
int wait() const;
void closeHandle();
private:
HANDLE _hProcess;
@@ -89,7 +90,7 @@ public:
Pipe* outPipe,
Pipe* errPipe,
const EnvImpl& env);
static void killImpl(const ProcessHandleImpl& handle);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);
static std::string terminationEventName(PIDImpl pid);

5
Foundation/include/Poco/Process_WINCE.h
View File

@@ -62,7 +62,8 @@ public:
UInt32 id() const;
HANDLE process() const;
int wait() const;
void closeHandle();
private:
HANDLE _hProcess;
UInt32 _pid;
@@ -89,7 +90,7 @@ public:
Pipe* outPipe,
Pipe* errPipe,
const EnvImpl& env);
static void killImpl(const ProcessHandleImpl& handle);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);
static std::string terminationEventName(PIDImpl pid);