summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-06-22 19:16:37 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-06-22 19:16:37 (GMT)
commitb91338960e1abafbf9328a700227b0e3f59a2226 (patch)
tree12f7e8e7c09027225e74614959a46baa32bf3339
parentbde67df0cd4de5e034c2cf4bd43c0d5657649942 (diff)
downloadcpython-b91338960e1abafbf9328a700227b0e3f59a2226.zip
cpython-b91338960e1abafbf9328a700227b0e3f59a2226.tar.gz
cpython-b91338960e1abafbf9328a700227b0e3f59a2226.tar.bz2
remove INT_MAX assertions; they can fail with large Py_ssize_t #9058
-rw-r--r--Misc/NEWS2
-rw-r--r--Objects/exceptions.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index feab9c5..cb60239 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,8 @@ What's New in Python 2.7 release candidate 2?
Core and Builtins
-----------------
+- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError.
+
- Issue #8202: Previous change to ``sys.argv[0]`` handling for -m command line
option reverted due to unintended side effects on handling of ``sys.path``.
See tracker issue for details.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 2e98283..711c87d 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1784,9 +1784,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);
}