Issue #28653: Fix a refleak in functools.lru_cache.

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 50766449524ef3c50ca53bde2b52b9b0d2098e5c..6a3bf649633f8a7ef3fb3c519ab9c70695ad2d4d 100644 (file)
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1162,6 +1162,25 @@ class TestLRU:
         self.assertEqual(misses, 4)
         self.assertEqual(currsize, 2)
 
+    def test_lru_type_error(self):
+        # Regression test for issue #28653.
+        # lru_cache was leaking when one of the arguments
+        # wasn't cacheable.
+
+        @functools.lru_cache(maxsize=None)
+        def infinite_cache(o):
+            pass
+
+        @functools.lru_cache(maxsize=10)
+        def limited_cache(o):
+            pass
+
+        with self.assertRaises(TypeError):
+            infinite_cache([])
+
+        with self.assertRaises(TypeError):
+            limited_cache([])
+
     def test_lru_with_maxsize_none(self):
         @self.module.lru_cache(maxsize=None)
         def fib(n):

diff --git a/Misc/NEWS b/Misc/NEWS
index f9e2f7225b711bd4535db310821b0b4271213b68..c50ce124196f17a11aa9cc40acd4e0be443a3993 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -457,6 +457,8 @@ Library
 
 - Issue #28652: Make loop methods reject socket kinds they do not support.
 
+- Issue #28653: Fix a refleak in functools.lru_cache.
+
 IDLE
 ----
 

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index d785c4932b6f4bb747d637c0881f48be44b6ccce..9c9ab5f8ea2f1c99776d4199b3ec365f55b0396a 100644 (file)
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -781,8 +781,10 @@ infinite_lru_cache_wrapper(lru_cache_object *self, PyObject *args, PyObject *kwd
     if (!key)
         return NULL;
     hash = PyObject_Hash(key);
-    if (hash == -1)
+    if (hash == -1) {
+        Py_DECREF(key);
         return NULL;
+    }
     result = _PyDict_GetItem_KnownHash(self->cache, key, hash);
     if (result) {
         Py_INCREF(result);
@@ -837,8 +839,10 @@ bounded_lru_cache_wrapper(lru_cache_object *self, PyObject *args, PyObject *kwds
     if (!key)
         return NULL;
     hash = PyObject_Hash(key);
-    if (hash == -1)
+    if (hash == -1) {
+        Py_DECREF(key);
         return NULL;
+    }
     link  = (lru_list_elem *)_PyDict_GetItem_KnownHash(self->cache, key, hash);
     if (link) {
         lru_cache_extricate_link(link);