summaryrefslogtreecommitdiffstats
path: root/Python/errors.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-28 00:18:43 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-28 00:18:43 (GMT)
commitef85a1ac1510203a06c15f1483b76f2f20b80ede (patch)
tree8440aa6d04968755fd02e9c421c75f45f70dcf3f /Python/errors.c
parentf9ce84b19531531d2f5748fb51404f5149fbd0fb (diff)
downloadcpython-ef85a1ac1510203a06c15f1483b76f2f20b80ede.zip
cpython-ef85a1ac1510203a06c15f1483b76f2f20b80ede.tar.gz
cpython-ef85a1ac1510203a06c15f1483b76f2f20b80ede.tar.bz2
Issue #22836: Keep exception reports sensible despite errors
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 5cbf5c9..e7c221c 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -696,12 +696,18 @@ PyErr_WriteUnraisable(PyObject *obj)
PyFile_WriteString(className, f);
if (v && v != Py_None) {
PyFile_WriteString(": ", f);
- PyFile_WriteObject(v, f, 0);
+ if (PyFile_WriteObject(v, f, 0) < 0) {
+ PyErr_Clear();
+ PyFile_WriteString("<exception repr() failed>", f);
+ }
}
Py_XDECREF(moduleName);
}
PyFile_WriteString(" in ", f);
- PyFile_WriteObject(obj, f, 0);
+ if (PyFile_WriteObject(obj, f, 0) < 0) {
+ PyErr_Clear();
+ PyFile_WriteString("<object repr() failed>", f);
+ }
PyFile_WriteString(" ignored\n", f);
PyErr_Clear(); /* Just in case */
}