Backported:

  Fix segfault with invalid coding.
(See SF bug: 772896 for another fix)

diff --git a/Misc/NEWS b/Misc/NEWS
index 5b63fe0008afde8b8cc21731cd8469cd3f527531..afb39a023f6c98fb78e0cdb6b57a473aca5a0a35 100644 (file)
--- 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 a35bb3f3ddd28f925f81d63a3f28bc66546e6e95..3317e551982581675d0747bc2a369765ac5d1b11 100644 (file)
--- 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: