Issue #14373: Fixed segmentation fault when gc.collect() is called during
constructing lru_cache (C implementation).
diff --git a/Misc/NEWS b/Misc/NEWS
index d8922be..508572a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@
Library
-------
+- Issue #14373: Fixed segmentation fault when gc.collect() is called during
+ constructing lru_cache (C implementation).
+
- Issue #24695: Fix a regression in traceback.print_exception(). If
exc_traceback is None we shouldn't print a traceback header like described
in the documentation.
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 95b5b13..dc64cfe 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -899,7 +899,7 @@
static PyObject *
lru_cache_new(PyTypeObject *type, PyObject *args, PyObject *kw)
{
- PyObject *func, *maxsize_O, *cache_info_type;
+ PyObject *func, *maxsize_O, *cache_info_type, *cachedict;
int typed;
lru_cache_object *obj;
Py_ssize_t maxsize;
@@ -937,15 +937,16 @@
return NULL;
}
- obj = (lru_cache_object *)type->tp_alloc(type, 0);
- if (obj == NULL)
+ if (!(cachedict = PyDict_New()))
return NULL;
- if (!(obj->cache = PyDict_New())) {
- Py_DECREF(obj);
+ obj = (lru_cache_object *)type->tp_alloc(type, 0);
+ if (obj == NULL) {
+ Py_DECREF(cachedict);
return NULL;
}
+ obj->cache = cachedict;
obj->root.prev = &obj->root;
obj->root.next = &obj->root;
obj->maxsize = maxsize;