Kaydet (Commit) 8d649638 authored tarafından Benjamin Peterson's avatar Benjamin Peterson

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
........
üst aae46dd8
...@@ -12,6 +12,8 @@ What's New in Python 2.6.6 alpha 1? ...@@ -12,6 +12,8 @@ What's New in Python 2.6.6 alpha 1?
Core and Builtins 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 - Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash
the interpreter with characters outside the Basic Multilingual Plane the interpreter with characters outside the Basic Multilingual Plane
(higher than 0x10000). (higher than 0x10000).
......
...@@ -1785,9 +1785,6 @@ PyUnicodeDecodeError_Create( ...@@ -1785,9 +1785,6 @@ PyUnicodeDecodeError_Create(
const char *encoding, const char *object, Py_ssize_t length, const char *encoding, const char *object, Py_ssize_t length,
Py_ssize_t start, Py_ssize_t end, const char *reason) 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", return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#nns",
encoding, object, length, start, end, reason); encoding, object, length, start, end, reason);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment