From: Zackery Spytz <zspytz@gmail.com>
Date: Mon, 20 Jul 2020 12:51:26 +0000 (-0600)
Subject: bpo-41336: Fix the error handling in zoneinfo_new_instance() (GH-21546)
X-Git-Tag: v3.10.0a1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eca2549f5a5048b44ca88b9555f1c62f094e3c12;p=thirdparty%2FPython%2Fcpython.git

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

Do not call PyObject_CallMethod() with a live exception (like
KeyboardInterrupt).
---

diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c
index 319d6c7b7760..bee84cbf8f9f 100644
--- a/Modules/_zoneinfo.c
+++ b/Modules/_zoneinfo.c
@@ -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);