mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[3.9] bpo-41056: Fix a possible MemoryError leak within zoneinfo. (GH-21007)

Browse source 
This was detected by our Coverity scan as a REVERSE_INULL issue.

Automerge-Triggered-By: @gpshead
(cherry picked from commit d780fa7)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
This commit is contained in:
Paul Ganssle 2020-06-24 11:58:50 -04:00 • committed by GitHub
parent d518ed0baa
commit 6c56356109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2020-06-20-18-33-03.bpo-41056.gTH4Bq.rst Normal file
View file

@ -0,0 +1 @@
Fixed an instance where a MemoryError within the zoneinfo module might not be reported or not reported at its source. (found by Coverity)

6
Modules/_zoneinfo.c
View file

@ -278,13 +278,11 @@ 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 +1620,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;
}