diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 0511339978897a..ed2d32688ecea5 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -462,7 +462,18 @@ tmtotuple(time_module_state *state, struct tm *p
if (v == NULL)
return NULL;
-#define SET(i,val) PyStructSequence_SET_ITEM(v, i, PyLong_FromLong((long) val))
+#define SET_ITEM(INDEX, CALL) \
+ do { \
+ PyObject *obj = (CALL); \
+ if (obj == NULL) { \
+ Py_DECREF(v); \
+ return NULL; \
+ } \
+ PyStructSequence_SET_ITEM(v, (INDEX), obj); \
+ } while (0)
+
+#define SET(INDEX, VAL) \
+ SET_ITEM((INDEX), PyLong_FromLong((long) (VAL)))
SET(0, p->tm_year + 1900);
SET(1, p->tm_mon + 1); /* Want January == 1 */
@@ -474,19 +485,15 @@ tmtotuple(time_module_state *state, struct tm *p
SET(7, p->tm_yday + 1); /* Want January, 1 == 1 */
SET(8, p->tm_isdst);
#ifdef HAVE_STRUCT_TM_TM_ZONE
- PyStructSequence_SET_ITEM(v, 9,
- PyUnicode_DecodeLocale(p->tm_zone, "surrogateescape"));
+ SET_ITEM(9, PyUnicode_DecodeLocale(p->tm_zone, "surrogateescape"));
SET(10, p->tm_gmtoff);
#else
- PyStructSequence_SET_ITEM(v, 9,
- PyUnicode_DecodeLocale(zone, "surrogateescape"));
- PyStructSequence_SET_ITEM(v, 10, _PyLong_FromTime_t(gmtoff));
+ SET_ITEM(9, PyUnicode_DecodeLocale(zone, "surrogateescape"));
+ SET_ITEM(10, _PyLong_FromTime_t(gmtoff));
#endif /* HAVE_STRUCT_TM_TM_ZONE */
+
#undef SET
- if (PyErr_Occurred()) {
- Py_XDECREF(v);
- return NULL;
- }
+#undef SET_ITEM
return v;
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy