commit 333544764619b8e338b7485ea94b9be9b9e75a9d
author Victor Stinner <victor.stinner@haypocalc.com> Mon Nov 21 02:01:41 2011 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> Mon Nov 21 02:01:41 2011 +0100
tree da0738d3cce74dbc11379c145097277d0fd9ddb6
parent 53b33e767d9aa85f2bf3add5850499596f9d0558

Check for PyUnicode_AS_UNICODE() failure

PC/_subprocess.c

diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index f0ad559..ec93d25 100644
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -417,6 +417,7 @@
     PROCESS_INFORMATION pi;
     STARTUPINFOW si;
     PyObject* environment;
+    wchar_t *wenvironment;
 
     Py_UNICODE* application_name;
     Py_UNICODE* command_line;
@@ -461,6 +462,17 @@
             return NULL;
     }
 
+    if (environment) {
+        wenvironment = PyUnicode_AsUnicode(environment)
+        if (wenvironment == NULL)
+        {
+            Py_XDECREF(environment);
+            return NULL;
+        }
+    }
+    else
+        wenvironment = NULL;
+
     Py_BEGIN_ALLOW_THREADS
     result = CreateProcessW(application_name,
                            command_line,
@@ -468,7 +480,7 @@
                            NULL,
                            inherit_handles,
                            creation_flags | CREATE_UNICODE_ENVIRONMENT,
-                           environment ? PyUnicode_AS_UNICODE(environment) : NULL,
+                           wenvironment,
                            current_directory,
                            &si,
                            &pi);