[2.7] bpo-31471: Fix assertion failure in subprocess.Popen() on Windows, in case...

diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index f73d14f57930f279b64076d02cfc9e4296fd8533..fc9aaa461132cab47fe1edcecadaf340186174d8 100644 (file)
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -341,9 +341,13 @@ getenvironment(PyObject* environment)
     envsize = PyMapping_Length(environment);
 
     keys = PyMapping_Keys(environment);
+    if (!keys) {
+        return NULL;
+    }
     values = PyMapping_Values(environment);
-    if (!keys || !values)
+    if (!values) {
         goto error;
+    }
 
     out = PyString_FromStringAndSize(NULL, 2048);
     if (! out)