https://github.com/python/cpython/commit/b4b4e764a798bab60324871074ce4cdebb9d01bb
commit: b4b4e764a798bab60324871074ce4cdebb9d01bb
branch: main
author: Nikita Sobolev <[email protected]>
committer: sobolevn <[email protected]>
date: 2024-03-09T14:18:38+03:00
summary:
gh-116520: Fix error handling in `os_get_terminal_size_impl` in `posixmodule`
(#116521)
files:
M Modules/posixmodule.c
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 920a6750f5136d..940a9cc8955e11 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -14981,12 +14981,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) */
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
