From: Hai Shi <shihai1992@gmail.com>
Date: Wed, 27 Jan 2021 10:23:33 +0000 (+0800)
Subject: bpo-42979: _zoneinfo exec function checks for PyDateTime_IMPORT failure (GH-24333)
X-Git-Tag: v3.10.0a5~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eeb701adc0fc29ba803fddf133d917ff45639a00;p=thirdparty%2FPython%2Fcpython.git

bpo-42979: _zoneinfo exec function checks for PyDateTime_IMPORT failure (GH-24333)

Importing datetime can fail.
---

diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c
index 4a4cbdbee38d..d0c462fb86ab 100644
--- a/Modules/_zoneinfo.c
+++ b/Modules/_zoneinfo.c
@@ -2629,6 +2629,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;