[3.13] gh-145492: Fix defaultdict __repr__ infinite recursion (GH-145659) (GH-145746)

miss-islington · KowalskiThomas · mvanhorn · web-flow · commit cef423cbe20d · 2026-03-12T10:45:43.000+01:00
(cherry picked from commit 2d35f9b) Includes test fix-up from GH-145788 (cherry picked from commit aa4240e) Co-authored-by: Thomas Kowalski <thom.kowa@gmail.com> Co-authored-by: Matt Van Horn <mvanhorn@users.noreply.github.com>
diff --git a/Lib/test/test_defaultdict.py b/Lib/test/test_defaultdict.py
@@ -204,5 +204,20 @@ def default_factory():
         self.assertEqual(test_dict[key], 2)
         self.assertEqual(count, 2)
 
+    def test_repr_recursive_factory(self):
+        # gh-145492: defaultdict.__repr__ should not cause infinite recursion
+        # when the factory's __repr__ calls repr() on the defaultdict.
+        class ProblematicFactory:
+            def __call__(self):
+                return {}
+            def __repr__(self):
+                repr(dd)
+                return f"ProblematicFactory for {dd}"
+
+        dd = defaultdict(ProblematicFactory())
+        # Should not raise RecursionError
+        r = repr(dd)
+        self.assertIn("ProblematicFactory for", r)
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2026-03-09-00-00-00.gh-issue-145492.457Afc.rst b/Misc/NEWS.d/next/Library/2026-03-09-00-00-00.gh-issue-145492.457Afc.rst
@@ -0,0 +1,3 @@
+Fix infinite recursion in :class:`collections.defaultdict` ``__repr__``
+when a ``defaultdict`` contains itself. Based on analysis by KowalskiThomas
+in :gh:`145492`.
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -2337,9 +2337,10 @@ defdict_repr(defdictobject *dd)
             }
             defrepr = PyUnicode_FromString("...");
         }
-        else
+        else {
             defrepr = PyObject_Repr(dd->default_factory);
-        Py_ReprLeave(dd->default_factory);
+            Py_ReprLeave(dd->default_factory);
+        }
     }
     if (defrepr == NULL) {
         Py_DECREF(baserepr);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fix infinite recursion in :class:`collections.defaultdict` ``__repr__``
	`2`	+when a ``defaultdict`` contains itself. Based on analysis by KowalskiThomas
	`3`	+in :gh:`145492`.
Original file line number	Diff line number	Diff line change
`@@ -2337,9 +2337,10 @@ defdict_repr(defdictobject *dd)`
`2337`	`2337`	`}`
`2338`	`2338`	`defrepr = PyUnicode_FromString("...");`
`2339`	`2339`	`}`
`2340`		`- else`
	`2340`	`+ else {`
`2341`	`2341`	`defrepr = PyObject_Repr(dd->default_factory);`
`2342`		`- Py_ReprLeave(dd->default_factory);`
	`2342`	`+ Py_ReprLeave(dd->default_factory);`
	`2343`	`+ }`
`2343`	`2344`	`}`
`2344`	`2345`	`if (defrepr == NULL) {`
`2345`	`2346`	`Py_DECREF(baserepr);`