diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-06-22 20:11:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-06-22 20:11:09 (GMT) |
| commit | 479a38b8fdccf3148c6fde15eddcc20912929679 (patch) | |
| tree | e41e0e57b9e2a7d998d71e72f392da4e9e0cfa81 | |
| parent | f4b552e7d574372a3706f181cabf2f19d4b7ddd8 (diff) | |
| download | cpython-479a38b8fdccf3148c6fde15eddcc20912929679.zip cpython-479a38b8fdccf3148c6fde15eddcc20912929679.tar.gz cpython-479a38b8fdccf3148c6fde15eddcc20912929679.tar.bz2 | |
Merged revisions 82159 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r82159 | benjamin.peterson | 2010-06-22 14:21:52 -0500 (Tue, 22 Jun 2010) | 9 lines
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
@@ -21,6 +21,8 @@ Core and Builtins The removed code was mutating the ST, causing a second compilation to fail. +- 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 234922c..841533e 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1608,9 +1608,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, "Uy#nnU", encoding, object, length, start, end, reason); } |