diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-02-28 03:16:11 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-02-28 03:16:11 (GMT) |
| commit | 3263f6874a96c7b2862bd91460a28e66ac039dbe (patch) | |
| tree | 7a730e6a8890fa5909b5500966cc838eac4862a5 /Python/errors.c | |
| parent | 738f88f688b7e490725bdcc9186a888998ca0370 (diff) | |
| download | cpython-3263f6874a96c7b2862bd91460a28e66ac039dbe.zip cpython-3263f6874a96c7b2862bd91460a28e66ac039dbe.tar.gz cpython-3263f6874a96c7b2862bd91460a28e66ac039dbe.tar.bz2 | |
Issue #22836: Keep exception reports sensible despite errors
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Python/errors.c b/Python/errors.c index 5ff1e4c..47d7c4b 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -900,8 +900,12 @@ PyErr_WriteUnraisable(PyObject *obj) if (obj) { if (PyFile_WriteString("Exception ignored in: ", f) < 0) goto done; - if (PyFile_WriteObject(obj, f, 0) < 0) - goto done; + if (PyFile_WriteObject(obj, f, 0) < 0) { + PyErr_Clear(); + if (PyFile_WriteString("<object repr() failed>", f) < 0) { + goto done; + } + } if (PyFile_WriteString("\n", f) < 0) goto done; } @@ -946,8 +950,12 @@ PyErr_WriteUnraisable(PyObject *obj) if (v && v != Py_None) { if (PyFile_WriteString(": ", f) < 0) goto done; - if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0) - goto done; + if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0) { + PyErr_Clear(); + if (PyFile_WriteString("<exception str() failed>", f) < 0) { + goto done; + } + } } if (PyFile_WriteString("\n", f) < 0) goto done; |