diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-06-22 19:21:52 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-06-22 19:21:52 (GMT) |
commit | 285a689c8fd8a9fe8fe8a42da40ed95a849aaf95 (patch) | |
tree | 4e1842218140cefad0fa0fd56360f38763d71ef4 | |
parent | 0fdbd97d5e1763e2f4186606514709dd7125f48c (diff) | |
download | cpython-285a689c8fd8a9fe8fe8a42da40ed95a849aaf95.zip cpython-285a689c8fd8a9fe8fe8a42da40ed95a849aaf95.tar.gz cpython-285a689c8fd8a9fe8fe8a42da40ed95a849aaf95.tar.bz2 |
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
........
-rw-r--r-- | Misc/NEWS | 2 | ||||
-rw-r--r-- | Objects/exceptions.c | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -37,6 +37,8 @@ Core and Builtins - Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode filenames and enable os.fsencode(). +- 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 3d5b1ea..b82b6ba 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1622,9 +1622,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, "sy#nns", encoding, object, length, start, end, reason); } |