From 2bc71ab7f5a2ed3f717538e247b9e935253cfc38 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sat, 20 Jun 2020 16:00:21 +0200 Subject: [PATCH] Fix two NULL ptr checks in zoneinfo Signed-off-by: Christian Heimes --- Modules/_zoneinfo.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c index e8b28319993a18d..418435e83faa9e2 100644 --- a/Modules/_zoneinfo.c +++ b/Modules/_zoneinfo.c @@ -278,13 +278,12 @@ zoneinfo_new(PyTypeObject *type, PyObject *args, PyObject *kw) instance = PyObject_CallMethod(weak_cache, "setdefault", "OO", key, tmp); - ((PyZoneInfo_ZoneInfo *)instance)->source = SOURCE_CACHE; - Py_DECREF(tmp); - if (instance == NULL) { return NULL; } + + ((PyZoneInfo_ZoneInfo *)instance)->source = SOURCE_CACHE; } update_strong_cache(type, key, instance); @@ -1622,7 +1621,7 @@ parse_abbr(const char *const p, PyObject **abbr) } *abbr = PyUnicode_FromStringAndSize(str_start, str_end - str_start); - if (abbr == NULL) { + if (*abbr == NULL) { return -1; }