rpms
/
python2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated version of patch

This commit is contained in:
dmalcolm 2010-06-22 19:07:26 +00:00
parent 468e2badf2
commit 500aee5ba1
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
python-2.6.5-remove-PyUnicodeDecodeError_Create-assertions-issue9058.patch
View File

@ -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);
}