From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 9 Jun 2023 20:55:34 +0000 (-0700)
Subject: [3.11] gh-105375: Improve posix error handling (GH-105592) (#105597)
X-Git-Tag: v3.11.5~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1797f661dab563c9b1fa9fdecf2bf1f4d5e0c8e;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-105375: Improve posix error handling (GH-105592) (#105597)

Fix a bug where an IndexError could end up being overwritten.
(cherry picked from commit f668f73bc88cce0112b304d87aa998fb28013c71)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
---

diff --git a/Misc/NEWS.d/next/Library/2023-06-09-21-30-59.gh-issue-105375.eewafp.rst b/Misc/NEWS.d/next/Library/2023-06-09-21-30-59.gh-issue-105375.eewafp.rst
new file mode 100644
index 000000000000..e000f98828a2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-06-09-21-30-59.gh-issue-105375.eewafp.rst
@@ -0,0 +1,2 @@
+Fix a bug in the :mod:`posix` module where an exception could be
+overwritten.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index a01662d868e5..7c367b9d2e98 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -5691,7 +5691,7 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
 {
     Py_ssize_t i, pos, envc;
     PyObject *keys=NULL, *vals=NULL;
-    PyObject *key, *val, *key2, *val2, *keyval;
+    PyObject *key2, *val2, *keyval;
     EXECV_CHAR **envlist;
 
     i = PyMapping_Size(env);
@@ -5716,10 +5716,14 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
     }
 
     for (pos = 0; pos < i; pos++) {
-        key = PyList_GetItem(keys, pos);
-        val = PyList_GetItem(vals, pos);
-        if (!key || !val)
+        PyObject *key = PyList_GetItem(keys, pos);  // Borrowed ref.
+        if (key == NULL) {
             goto error;
+        }
+        PyObject *val = PyList_GetItem(vals, pos);  // Borrowed ref.
+        if (val == NULL) {
+            goto error;
+        }
 
 #if defined(HAVE_WEXECV) || defined(HAVE_WSPAWNV)
         if (!PyUnicode_FSDecoder(key, &key2))