Issue #28653: Fix a refleak in functools.lru_cache.
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 5076644..6a3bf64 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1162,6 +1162,25 @@
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 f9e2f72..c50ce12 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -457,6 +457,8 @@
- 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 d785c49..9c9ab5f 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -781,8 +781,10 @@
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 @@
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);