From: Fredrik Lundh <fredrik@pythonware.com>
Date: Sat, 12 Nov 2005 10:15:14 +0000 (+0000)
Subject:  r858@spiff:  Fredrik | 2005-11-10 23:40:04 +0100
X-Git-Tag: v2.5a0~1178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a49e92d7dd7154a1f382ca1b28ffe610295147f;p=thirdparty%2FPython%2Fcpython.git

 r858@spiff:  Fredrik | 2005-11-10 23:40:04 +0100
 #1346547

 added basic error checking to the STARTUPINFO code
 in CreateProcess.
---

diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index f107c1340df1..a09b0160a689 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 {