[3.8] bpo-41909: Enable previously disabled recursion checks. (GH-22536) (GH-22551)

serhiy-storchaka · web-flow · commit 09a7b3b618cd · 2020-10-05T01:28:00.000+03:00
Enable recursion checks which were disabled when get __bases__ of non-type objects in issubclass() and isinstance() and when intern strings. It fixes a stack overflow when getting __bases__ leads to infinite recursion. Originally recursion checks was disabled for PyDict_GetItem() which silences all errors including the one raised in case of detected recursion and can return incorrect result. But now the code uses PyDict_GetItemWithError() and PyDict_SetDefault() instead. (cherry picked from commit 9ece9cd)
diff --git a/Lib/test/test_isinstance.py b/Lib/test/test_isinstance.py
@@ -271,6 +271,16 @@ def __bases__(self):
 
         self.assertEqual(True, issubclass(B(), int))
 
+    def test_infinite_recursion_in_bases(self):
+        class X:
+            @property
+            def __bases__(self):
+                return self.__bases__
+
+        self.assertRaises(RecursionError, issubclass, X(), int)
+        self.assertRaises(RecursionError, issubclass, int, X())
+        self.assertRaises(RecursionError, isinstance, 1, X())
+
 
 def blowstack(fxn, arg, compare_to):
     # Make sure that calling isinstance with a deeply nested tuple for its
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-10-04-10-55-12.bpo-41909.BqHPcm.rst b/Misc/NEWS.d/next/Core and Builtins/2020-10-04-10-55-12.bpo-41909.BqHPcm.rst
@@ -0,0 +1,2 @@
+Fixed stack overflow in :func:`issubclass` and :func:`isinstance` when
+getting the ``__bases__`` attribute leads to infinite recursion.
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2316,9 +2316,7 @@ abstract_get_bases(PyObject *cls)
     _Py_IDENTIFIER(__bases__);
     PyObject *bases;
 
-    Py_ALLOW_RECURSION
     (void)_PyObject_LookupAttrId(cls, &PyId___bases__, &bases);
-    Py_END_ALLOW_RECURSION
     if (bases != NULL && !PyTuple_Check(bases)) {
         Py_DECREF(bases);
         return NULL;
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -15285,9 +15285,7 @@ PyUnicode_InternInPlace(PyObject **p)
             return;
         }
     }
-    Py_ALLOW_RECURSION
     t = PyDict_SetDefault(interned, s, s);
-    Py_END_ALLOW_RECURSION
     if (t == NULL) {
         PyErr_Clear();
         return;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fixed stack overflow in :func:`issubclass` and :func:`isinstance` when
	`2`	+getting the ``__bases__`` attribute leads to infinite recursion.
Original file line number	Diff line number	Diff line change
`@@ -15285,9 +15285,7 @@ PyUnicode_InternInPlace(PyObject **p)`
`15285`	`15285`	`return;`
`15286`	`15286`	`}`
`15287`	`15287`	`}`
`15288`		`- Py_ALLOW_RECURSION`
`15289`	`15288`	`t = PyDict_SetDefault(interned, s, s);`
`15290`		`- Py_END_ALLOW_RECURSION`
`15291`	`15289`	`if (t == NULL) {`
`15292`	`15290`	`PyErr_Clear();`
`15293`	`15291`	`return;`