From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:41:46 +0000 (+0100)
Subject: [3.11] gh-116520: Fix error handling in `os_get_terminal_size_impl` in `posixmodule... 
X-Git-Tag: v3.11.9~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2898f89bf0c7677a87532cdc1cafacce2ab00c9;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-116520: Fix error handling in `os_get_terminal_size_impl` in `posixmodule` (GH-116521) (#116540)

gh-116520: Fix error handling in `os_get_terminal_size_impl` in `posixmodule` (GH-116521)
(cherry picked from commit b4b4e764a798bab60324871074ce4cdebb9d01bb)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index db41e81463cc..b318911d4469 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -13447,12 +13447,23 @@ os_get_terminal_size_impl(PyObject *module, int fd)
     termsize = PyStructSequence_New((PyTypeObject *)TerminalSizeType);
     if (termsize == NULL)
         return NULL;
-    PyStructSequence_SET_ITEM(termsize, 0, PyLong_FromLong(columns));
-    PyStructSequence_SET_ITEM(termsize, 1, PyLong_FromLong(lines));
-    if (PyErr_Occurred()) {
-        Py_DECREF(termsize);
-        return NULL;
-    }
+
+    int pos = 0;
+
+#define SET_TERMSIZE(CALL)                                   \
+    do {                                                     \
+        PyObject *item = (CALL);                             \
+        if (item == NULL) {                                  \
+            Py_DECREF(termsize);                             \
+            return NULL;                                     \
+        }                                                    \
+        PyStructSequence_SET_ITEM(termsize, pos++, item);    \
+    } while(0)
+
+    SET_TERMSIZE(PyLong_FromLong(columns));
+    SET_TERMSIZE(PyLong_FromLong(lines));
+#undef SET_TERMSIZE
+
     return termsize;
 }
 #endif /* defined(TERMSIZE_USE_CONIO) || defined(TERMSIZE_USE_IOCTL) */