From 0e40e27541202ba79376ac270fb51e90048bb1c4 Mon Sep 17 00:00:00 2001
From: Tim Golden <mail@timgolden.me.uk>
Date: Fri, 6 Aug 2010 13:03:56 +0000
Subject: Issue #3210: Ensure stdio handles are closed if CreateProcess fails

---
 PC/_subprocess.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'PC')

diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index 5132a5ed00..2a3207b87d 100644
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -429,6 +429,7 @@ sp_CreateProcess(PyObject* self, PyObject* args)
     PyObject* env_mapping;
     Py_UNICODE* current_directory;
     PyObject* startup_info;
+    DWORD error;
 
     if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess",
                            &application_name,
@@ -478,8 +479,22 @@ sp_CreateProcess(PyObject* self, PyObject* args)
 
     Py_XDECREF(environment);
 
-    if (! result)
-        return PyErr_SetFromWindowsErr(GetLastError());
+    if (! result) {
+        error = GetLastError();
+        if(si.hStdInput != INVALID_HANDLE_VALUE) {
+            CloseHandle(si.hStdInput);
+            si.hStdInput = INVALID_HANDLE_VALUE;
+        }
+        if(si.hStdOutput != INVALID_HANDLE_VALUE) {
+            CloseHandle(si.hStdOutput);
+            si.hStdOutput = INVALID_HANDLE_VALUE;
+        }
+        if(si.hStdError != INVALID_HANDLE_VALUE) {
+            CloseHandle(si.hStdError);
+            si.hStdError = INVALID_HANDLE_VALUE;
+        }
+        return PyErr_SetFromWindowsErr(error);
+    }
 
     return Py_BuildValue("NNii",
                          sp_handle_new(pi.hProcess),
-- 
cgit v1.2.1