summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2005-10-02 01:51:56 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2005-10-02 01:51:56 (GMT)
commitd00e54bc2582029f8cca9a965d015cf206605916 (patch)
tree969fb6ae261faa4d25ec495e8095db0e1459a2ab
parent6b61a28e628202b90b5da662aba6b887b7056f17 (diff)
downloadcpython-d00e54bc2582029f8cca9a965d015cf206605916.zip
cpython-d00e54bc2582029f8cca9a965d015cf206605916.tar.gz
cpython-d00e54bc2582029f8cca9a965d015cf206605916.tar.bz2
Backported:
Fix segfault with invalid coding. (See SF bug: 772896 for another fix)
-rw-r--r--Misc/NEWS5
-rw-r--r--Python/pythonrun.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 5b63fe0..afb39a0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,11 @@ What's New in Python 2.4.3c1?
*Release date: XX-XX-200X*
+Core and builtins
+-----------------
+
+- Fix segfault with invalid coding.
+
Extension Modules
-----------------
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index a35bb3f..3317e55 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1484,7 +1484,7 @@ err_input(perrdetail *err)
msg = "unknown decode error";
Py_DECREF(type);
Py_DECREF(value);
- Py_DECREF(tb);
+ Py_XDECREF(tb);
break;
}
default: