From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 24 May 2023 04:40:21 +0000 (-0700)
Subject: [3.12] gh-104372: use == -1 before PyErr_Occurred (GH-104831) (#104833)
X-Git-Tag: v3.12.0b2~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b719dd8725a820a1af4b76c30ae87c23d8db68c0;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-104372: use == -1 before PyErr_Occurred (GH-104831) (#104833)

gh-104372: use == -1 before PyErr_Occurred (GH-104831)

The ideal pattern for this.  (already in the 3.11 backport)
(cherry picked from commit 7f963bfc79a515dc9822ebddbfb1b5927d2dda09)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
---

diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index 1b7fe71186a1..63403795569a 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -200,7 +200,7 @@ convert_fds_to_keep_to_c(PyObject *py_fds_to_keep, int *c_fds_to_keep)
     for (i = 0; i < len; ++i) {
         PyObject* fdobj = PyTuple_GET_ITEM(py_fds_to_keep, i);
         long fd = PyLong_AsLong(fdobj);
-        if (PyErr_Occurred()) {
+        if (fd == -1 && PyErr_Occurred()) {
             return -1;
         }
         if (fd < 0 || fd > INT_MAX) {