From 895591c1f0bdec5ad357fe6a5fd0875990061357 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 27 Jan 2021 03:08:45 -0800 Subject: [PATCH] bpo-42979: _zoneinfo exec function checks for PyDateTime_IMPORT failure (GH-24333) (GH-24351) Importing datetime can fail. (cherry picked from commit eeb701adc0fc29ba803fddf133d917ff45639a00) Co-authored-by: Hai Shi Co-authored-by: Hai Shi --- Modules/_zoneinfo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c index 0913860a4d49..0a4b38a6dc5a 100644 --- a/Modules/_zoneinfo.c +++ b/Modules/_zoneinfo.c @@ -2634,6 +2634,9 @@ static int zoneinfomodule_exec(PyObject *m) { PyDateTime_IMPORT; + if (PyDateTimeAPI == NULL) { + goto error; + } PyZoneInfo_ZoneInfoType.tp_base = PyDateTimeAPI->TZInfoType; if (PyType_Ready(&PyZoneInfo_ZoneInfoType) < 0) { goto error; -- 2.47.3