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

gpshead · web-flow · commit 7f963bfc79a5 · 2023-05-24T04:15:49.000Z
The ideal pattern for this.  (already in the 3.11 backport)
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ convert_fds_to_keep_to_c(PyObject py_fds_to_keep, int c_fds_to_keep)`
`200`	`200`	`for (i = 0; i < len; ++i) {`
`201`	`201`	`PyObject* fdobj = PyTuple_GET_ITEM(py_fds_to_keep, i);`
`202`	`202`	`long fd = PyLong_AsLong(fdobj);`
`203`		`- if (PyErr_Occurred()) {`
	`203`	`+ if (fd == -1 && PyErr_Occurred()) {`
`204`	`204`	`return -1;`
`205`	`205`	`}`
`206`	`206`	`if (fd < 0 \|\| fd > INT_MAX) {`