Skip to content

Commit

Permalink
[3.12] gh-118998: Handle errors correctly in tmtotuple in `timemodu…
Browse files Browse the repository at this point in the history
…le` (GH-118999) (#119019)

gh-118998: Handle errors correctly in `tmtotuple` in `timemodule` (GH-118999)
(cherry picked from commit fc75792)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
  • Loading branch information
miss-islington and sobolevn authored May 13, 2024
1 parent 275ec39 commit 5bf7f5c
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions Modules/timemodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,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 */
Expand All @@ -493,19 +504,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;
}
Expand Down

0 comments on commit 5bf7f5c

Please sign in to comment.