Skip to content

Commit

Permalink
pythongh-111789: Use PyDict_GetItemRef() in Modules/_zoneinfo.c (pyth…
Browse files Browse the repository at this point in the history
  • Loading branch information
serhiy-storchaka authored and aisk committed Feb 11, 2024
1 parent 33a36ca commit 9c84896
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions Modules/_zoneinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,28 +853,19 @@ load_timedelta(zoneinfo_state *state, long seconds)
if (pyoffset == NULL) {
return NULL;
}
rv = PyDict_GetItemWithError(state->TIMEDELTA_CACHE, pyoffset);
if (rv == NULL) {
if (PyErr_Occurred()) {
goto error;
}
if (PyDict_GetItemRef(state->TIMEDELTA_CACHE, pyoffset, &rv) == 0) {
PyObject *tmp = PyDateTimeAPI->Delta_FromDelta(
0, seconds, 0, 1, PyDateTimeAPI->DeltaType);

if (tmp == NULL) {
goto error;
if (tmp != NULL) {
rv = PyDict_SetDefault(state->TIMEDELTA_CACHE, pyoffset, tmp);
Py_XINCREF(rv);
Py_DECREF(tmp);
}

rv = PyDict_SetDefault(state->TIMEDELTA_CACHE, pyoffset, tmp);
Py_DECREF(tmp);
}

Py_XINCREF(rv);
Py_DECREF(pyoffset);
return rv;
error:
Py_DECREF(pyoffset);
return NULL;
}

/* Constructor for _ttinfo object - this starts by initializing the _ttinfo
Expand Down

0 comments on commit 9c84896

Please sign in to comment.