From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 2 Oct 2005 01:51:56 +0000 (+0000)
Subject: Backported:
X-Git-Tag: v2.4.3c1~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d00e54bc2582029f8cca9a965d015cf206605916;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 5b63fe0008af..afb39a023f6c 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 a35bb3f3ddd2..3317e5519825 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: