Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-41336: Fix the error handling in zoneinfo_new_instance() (GH-21546) 

Do not call PyObject_CallMethod() with a live exception (like
KeyboardInterrupt).
This commit is contained in:
Zackery Spytz 2020-07-20 06:51:26 -06:00 committed by GitHub
parent f9bf015799
commit eca2549f5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_zoneinfo.c
View File

@ -224,8 +224,14 @@ error:
self = NULL;
cleanup:
if (file_obj != NULL) {
PyObject *exc, *val, *tb;
PyErr_Fetch(&exc, &val, &tb);
PyObject *tmp = PyObject_CallMethod(file_obj, "close", NULL);
Py_DECREF(tmp);
_PyErr_ChainExceptions(exc, val, tb);
if (tmp == NULL) {
Py_CLEAR(self);
}
Py_XDECREF(tmp);
Py_DECREF(file_obj);
}
Py_DECREF(file_path);