summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2012-11-11 03:19:49 +0100
committerNadeem Vawda <nadeem.vawda@gmail.com>2012-11-11 03:19:49 +0100
commitc8d8929d95e792127bba42a42ccd97dee165dbd4 (patch)
tree110d2ed1ee5d0fb80b288174f519a0e24fbcd754 /Python/errors.c
parent1705501613e48d1a0c235c5eb49e31db31029e31 (diff)
parent1672dbd709963c9b62601d4e043a9ae2ad826760 (diff)
downloadcpython-c8d8929d95e792127bba42a42ccd97dee165dbd4.tar.gz
Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access previously-freed memory.
Patch by Serhiy Storchaka.
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 626b16e46f..a2d1a82ddf 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -798,7 +798,12 @@ PyErr_WriteUnraisable(PyObject *obj)
PyErr_Fetch(&t, &v, &tb);
f = PySys_GetObject("stderr");
if (f != NULL && f != Py_None) {
- PyFile_WriteString("Exception ", f);
+ if (obj) {
+ PyFile_WriteString("Exception ignored in: ", f);
+ PyFile_WriteObject(obj, f, 0);
+ PyFile_WriteString("\n", f);
+ }
+ PyTraceBack_Print(tb, f);
if (t) {
PyObject* moduleName;
char* className;
@@ -828,15 +833,11 @@ PyErr_WriteUnraisable(PyObject *obj)
PyFile_WriteString(className, f);
if (v && v != Py_None) {
PyFile_WriteString(": ", f);
- PyFile_WriteObject(v, f, 0);
+ PyFile_WriteObject(v, f, Py_PRINT_RAW);
}
+ PyFile_WriteString("\n", f);
Py_XDECREF(moduleName);
}
- if (obj) {
- PyFile_WriteString(" in ", f);
- PyFile_WriteObject(obj, f, 0);
- }
- PyFile_WriteString(" ignored\n", f);
PyErr_Clear(); /* Just in case */
}
Py_XDECREF(t);