Issue #3210: Revert C module changes and apply patch from Hirokazu Yamamoto instead
diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index 2a3207b..5132a5e 100644
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -429,7 +429,6 @@
PyObject* env_mapping;
Py_UNICODE* current_directory;
PyObject* startup_info;
- DWORD error;
if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess",
&application_name,
@@ -479,22 +478,8 @@
Py_XDECREF(environment);
- 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);
- }
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
return Py_BuildValue("NNii",
sp_handle_new(pi.hProcess),