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

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 9ece9cd65c)
This commit is contained in:
Serhiy Storchaka 2020-10-05 01:27:38 +03:00 committed by GitHub
parent f3a6b7fc0b
commit 7aa22ba923
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions

View file

@ -15602,9 +15602,7 @@ PyUnicode_InternInPlace(PyObject **p)
}
PyObject *t;
Py_ALLOW_RECURSION
t = PyDict_SetDefault(interned, s, s);
Py_END_ALLOW_RECURSION
if (t == NULL) {
PyErr_Clear();