bpo-25455: Fixed crashes in repr of recursive buffered file-like objects. (#514)

This commit is contained in:
Serhiy Storchaka 2017-03-19 19:25:29 +02:00 committed by GitHub
parent 77ed11552d
commit a5af6e1af7
6 changed files with 74 additions and 9 deletions

View file

@ -1415,8 +1415,18 @@ buffered_repr(buffered *self)
res = PyUnicode_FromFormat("<%s>", Py_TYPE(self)->tp_name);
}
else {
res = PyUnicode_FromFormat("<%s name=%R>",
Py_TYPE(self)->tp_name, nameobj);
int status = Py_ReprEnter((PyObject *)self);
res = NULL;
if (status == 0) {
res = PyUnicode_FromFormat("<%s name=%R>",
Py_TYPE(self)->tp_name, nameobj);
Py_ReprLeave((PyObject *)self);
}
else if (status > 0) {
PyErr_Format(PyExc_RuntimeError,
"reentrant call inside %s.__repr__",
Py_TYPE(self)->tp_name);
}
Py_DECREF(nameobj);
}
return res;