From 8d6496385d348479c241578b941890dd967084bf Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 22 Jun 2010 19:21:33 +0000 Subject: Merged revisions 82157 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82157 | benjamin.peterson | 2010-06-22 14:16:37 -0500 (Tue, 22 Jun 2010) | 1 line remove INT_MAX assertions; they can fail with large Py_ssize_t #9058 ........ --- Misc/NEWS | 2 ++ Objects/exceptions.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index e8eab86..832f7df 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ What's New in Python 2.6.6 alpha 1? Core and Builtins ----------------- +- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError. + - Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash the interpreter with characters outside the Basic Multilingual Plane (higher than 0x10000). diff --git a/Objects/exceptions.c b/Objects/exceptions.c index af67cc7..a0d7b53 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1785,9 +1785,6 @@ PyUnicodeDecodeError_Create( 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); } -- cgit v0.12