Index: Lib/test/test_subprocess.py =================================================================== --- Lib/test/test_subprocess.py (revision 83741) +++ Lib/test/test_subprocess.py (working copy) @@ -544,7 +544,26 @@ output = subprocess.check_output([sys.executable, '-c', code]) self.assert_(output.startswith(b'Hello World!'), ascii(output)) + def test_handles_closed_on_exception(self): + # If CreateProcess exits with an error, ensure the + # duplicate output handles are released + ifhandle, ifname = mkstemp() + ofhandle, ofname = mkstemp() + efhandle, efname = mkstemp() + try: + subprocess.Popen (["*"], stdin=ifhandle, stdout=ofhandle, stderr=efhandle) + except OSError: + os.close(ifhandle) + os.remove(ifname) + os.close(ofhandle) + os.remove(ofname) + os.close(efhandle) + os.remove(efname) + self.assert_(not os.path.exists(ifname)) + self.assert_(not os.path.exists(ofname)) + self.assert_(not os.path.exists(efname)) + # context manager class _SuppressCoreFiles(object): """Try to prevent core files from being created.""" Index: PC/_subprocess.c =================================================================== --- PC/_subprocess.c (revision 83741) +++ PC/_subprocess.c (working copy) @@ -429,6 +429,7 @@ PyObject* env_mapping; Py_UNICODE* current_directory; PyObject* startup_info; + DWORD error; if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess", &application_name, @@ -478,8 +479,22 @@ 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),