Skip to content

gh-105375: Improve error handling in zoneinfo module #105586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 9, 2023
Merged

gh-105375: Improve error handling in zoneinfo module #105586

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
167aa37
gh-105375: Improve error handling in `zoneinfo` module
sobolevn Jun 9, 2023
0395430
Revert PyMem_Malloc change
sobolevn Jun 9, 2023
1a4a68b
Update Misc/NEWS.d/next/Library/2023-06-09-21-11-28.gh-issue-105375.4…
sobolevn Jun 9, 2023
9e28c5d
Address review
sobolevn Jun 9, 2023
9e559e0
Update Modules/_zoneinfo.c
erlend-aasland Jun 9, 2023
98ea01b
Revert unneeded newline change
erlend-aasland Jun 9, 2023
8be2d24
Address review
sobolevn Jun 9, 2023
307a59d
Merge branch 'main' into issue-105375-zoneinfo
erlend-aasland Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-06-09-21-11-28.gh-issue-105375.4Mxn7t.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bugs in :mod:`zoneinfo` where exceptions could be overwritten.
19 changes: 13 additions & 6 deletions Modules/_zoneinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,14 +694,21 @@ zoneinfo_fromutc(PyObject *obj_self, PyObject *dt)
}
else {
PyObject *replace = PyObject_GetAttrString(tmp, "replace");
if (replace == NULL) {
Py_DECREF(tmp);
return NULL;
}
PyObject *args = PyTuple_New(0);
if (args == NULL) {
Py_DECREF(tmp);
Py_DECREF(replace);
return NULL;
}
PyObject *kwargs = PyDict_New();

Py_DECREF(tmp);
if (args == NULL || kwargs == NULL || replace == NULL) {
Py_XDECREF(args);
Py_XDECREF(kwargs);
Py_XDECREF(replace);
if (kwargs == NULL) {
Py_DECREF(tmp);
Py_DECREF(replace);
Py_DECREF(args);
return NULL;
}

Expand Down