xiaolanpython
diff --git a/‎Lib/test/test_descr.py‎
Lines changed: 8 additions & 0 deletions b/‎Lib/test/test_descr.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎Misc/NEWS‎
Lines changed: 3 additions & 0 deletions b/‎Misc/NEWS‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎Objects/typeobject.c‎
Lines changed: 1 addition & 1 deletion b/‎Objects/typeobject.c‎
Lines changed: 1 addition & 1 deletion
@@ -4252,6 +4252,14 @@ class FakeStr:
         with self.assertRaises(TypeError):
             str.__add__(fake_str, "abc")
 
+    def test_repr_as_str(self):
+        # Issue #11603: crash or infinite loop when rebinding __str__ as
+        # __repr__.
+        class Foo:
+            pass
+        Foo.__repr__ = Foo.__str__
+        foo = Foo()
+        str(foo)
 
 class DictProxyTests(unittest.TestCase):
     def setUp(self):
 
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11603: Fix a crash when __str__ is rebound as __repr__.  Patch by
+  Andreas Stührk.
+
 - Issue #11321: Fix a crash with multiple imports of the _pickle module when
   embedding Python.  Patch by Andreas Stührk.
 
 
@@ -2890,7 +2890,7 @@ object_str(PyObject *self)
     unaryfunc f;
 
     f = Py_TYPE(self)->tp_repr;
-    if (f == NULL)
+    if (f == NULL || f == object_str)
         f = object_repr;
     return f(self);
 }
Original file line number	Diff line number	Diff line change
`@@ -2890,7 +2890,7 @@ object_str(PyObject *self)`
`2890`	`2890`	`unaryfunc f;`
`2891`	`2891`
`2892`	`2892`	`f = Py_TYPE(self)->tp_repr;`
`2893`		`- if (f == NULL)`
	`2893`	`+ if (f == NULL \|\| f == object_str)`
`2894`	`2894`	`f = object_repr;`
`2895`	`2895`	`return f(self);`
`2896`	`2896`	`}`