pythongh-108295: Fix crashes with TypeVar weakrefs (python#108517)

miss-islington · Aug 27, 2023 · 482fad7 · 482fad7
1 parent 2b15536
commit 482fad7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -544,6 +544,16 @@ def test_bad_var_substitution(self):
                 with self.assertRaises(TypeError):
                     list[T][arg]
 
+    def test_many_weakrefs(self):
+        # gh-108295: this used to segfault
+        for cls in (ParamSpec, TypeVarTuple, TypeVar):
+            with self.subTest(cls=cls):
+                vals = weakref.WeakValueDictionary()
+
+                for x in range(100000):
+                    vals[x] = cls(str(x))
+                del vals
+
 
 def template_replace(templates: list[str], replacements: dict[str, list[str]]) -> list[tuple[str]]:
     """Renders templates with possible combinations of replacements.

diff --git a/Misc/NEWS.d/next/Library/2023-08-26-08-38-57.gh-issue-108295.Pn0QRM.rst b/Misc/NEWS.d/next/Library/2023-08-26-08-38-57.gh-issue-108295.Pn0QRM.rst
@@ -0,0 +1 @@
+Fix crashes related to use of weakrefs on :data:`typing.TypeVar`.
diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c
@@ -201,6 +201,7 @@ typevar_dealloc(PyObject *self)
     Py_XDECREF(tv->constraints);
     Py_XDECREF(tv->evaluate_constraints);
     _PyObject_ClearManagedDict(self);
+    PyObject_ClearWeakRefs(self);
 
     Py_TYPE(self)->tp_free(self);
     Py_DECREF(tp);
@@ -743,6 +744,7 @@ paramspec_dealloc(PyObject *self)
     Py_DECREF(ps->name);
     Py_XDECREF(ps->bound);
     _PyObject_ClearManagedDict(self);
+    PyObject_ClearWeakRefs(self);
 
     Py_TYPE(self)->tp_free(self);
     Py_DECREF(tp);
@@ -1022,6 +1024,7 @@ typevartuple_dealloc(PyObject *self)
 
     Py_DECREF(tvt->name);
     _PyObject_ClearManagedDict(self);
+    PyObject_ClearWeakRefs(self);
 
     Py_TYPE(self)->tp_free(self);
     Py_DECREF(tp);