summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Lundh <fredrik@pythonware.com>2005-11-12 10:15:14 (GMT)
committerFredrik Lundh <fredrik@pythonware.com>2005-11-12 10:15:14 (GMT)
commit3a49e92d7dd7154a1f382ca1b28ffe610295147f (patch)
tree275e27e5160c7196c9578e8b16a9c2d68c86064f
parentbb4692b6f2ee67994ef43e7a359ffd987392261d (diff)
downloadcpython-3a49e92d7dd7154a1f382ca1b28ffe610295147f.zip
cpython-3a49e92d7dd7154a1f382ca1b28ffe610295147f.tar.gz
cpython-3a49e92d7dd7154a1f382ca1b28ffe610295147f.tar.bz2
r858@spiff: Fredrik | 2005-11-10 23:40:04 +0100
#1346547 added basic error checking to the STARTUPINFO code in CreateProcess.
-rw-r--r--PC/_subprocess.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index f107c13..a09b016 100644
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -385,6 +385,9 @@ sp_CreateProcess(PyObject* self, PyObject* args)
si.hStdOutput = gethandle(startup_info, "hStdOutput");
si.hStdError = gethandle(startup_info, "hStdError");
+ if (PyErr_Occurred())
+ return NULL;
+
if (env_mapping == Py_None)
environment = NULL;
else {