traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #18408: Fix PyErr_NormalizeException(), handle PyObject_IsSubclass() failure 

PyObject_IsSubclass() can fail and raise a new exception!
This commit is contained in:
Victor Stinner 2013-07-17 00:44:53 +02:00
parent bdf630c4a7
commit 74a7fa6663
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Python/errors.c
View File

@ -227,12 +227,21 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
value will be an instance.
*/
if (PyExceptionClass_Check(type)) {
int is_subclass;
if (inclass) {
is_subclass = PyObject_IsSubclass(inclass, type);
if (is_subclass < 0)
goto finally;
}
else
is_subclass = 0;
/* if the value was not an instance, or is not an instance
whose class is (or is derived from) type, then use the
value as an argument to instantiation of the type
class.
*/
if (!inclass || !PyObject_IsSubclass(inclass, type)) {
if (!inclass || !is_subclass) {
PyObject *args, *res;
if (value == Py_None)