From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 25 Jul 2015 09:10:21 +0000 (+0300)
Subject: Issue #14373: Fixed segmentation fault when gc.collect() is called during
X-Git-Tag: v3.5.0b4~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=374164c2f5a2f95f74cc9b97d4b58d7c74ff3a94;p=python

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 d8922be945..508572a5ff 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@ Core and Builtins
 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 95b5b13fbe..dc64cfee2d 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -899,7 +899,7 @@ bounded_lru_cache_wrapper(lru_cache_object *self, PyObject *args, PyObject *kwds
 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 @@ lru_cache_new(PyTypeObject *type, PyObject *args, PyObject *kw)
         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;