From 500aee5ba1e55275f4e001e3cbbaeb13590c8003 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Tue, 22 Jun 2010 19:07:26 +0000 Subject: [PATCH] updated version of patch --- ...ecodeError_Create-assertions-issue9058.patch | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch b/python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch index 02d5fe6..113305a 100644 --- a/python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch +++ b/python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch @@ -2,24 +2,13 @@ Index: Objects/exceptions.c =================================================================== --- Objects/exceptions.c (revision 82153) +++ Objects/exceptions.c (working copy) -@@ -1784,11 +1784,15 @@ +@@ -1784,9 +1784,6 @@ const char *encoding, const char *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) { - assert(length < INT_MAX); - assert(start < INT_MAX); - assert(end < INT_MAX); -- return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#nns", -- encoding, object, length, start, end, reason); -+ PyObject *str; -+ -+ str = PyString_FromStringAndSize(object, length); -+ -+ if (!str) -+ return NULL; -+ -+ return PyObject_CallFunction(PyExc_UnicodeDecodeError, "sNnns", -+ encoding, str, start, end, reason); + return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#nns", + encoding, object, length, start, end, reason); } - -