Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #3210: Ensure stdio handles are closed if CreateProcess fails

This commit is contained in:
Tim Golden 2010-08-06 13:20:12 +00:00
parent 51ced7afe7
commit 40b3744efa
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/test/test_subprocess.py
View File

@ -548,6 +548,26 @@ class ProcessTestCase(unittest.TestCase):
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 = self.mkstemp()
ofhandle, ofname = self.mkstemp()
efhandle, efname = self.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.assertFalse(os.path.exists(ifname))
self.assertFalse(os.path.exists(ofname))
self.assertFalse(os.path.exists(efname))
#
# POSIX tests
#

19
PC/_subprocess.c
View File

@ -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),