From 8380dd5aa42372929fe962ebdc3c180d929e497a Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 16 Apr 2010 22:51:37 +0000 Subject: Merged revisions 80126 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80126 | benjamin.peterson | 2010-04-16 17:35:38 -0500 (Fri, 16 Apr 2010) | 1 line have a clear error when passing something > sys.maxsize to bytearray ........ --- Lib/test/test_bytes.py | 1 + Misc/NEWS | 3 +++ Objects/bytearrayobject.c | 18 +++++++++++------- Objects/bytesobject.c | 12 +++++++----- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index c27cc3a..06ff4c9 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -75,6 +75,7 @@ class BaseBytesTest(unittest.TestCase): self.assertEqual(self.type2test('0', 'ascii'), b'0') self.assertEqual(self.type2test(b'0'), b'0') + self.assertRaises(OverflowError, self.type2test, sys.maxsize + 1) def test_constructor_type_errors(self): self.assertRaises(TypeError, self.type2test, 0.0) diff --git a/Misc/NEWS b/Misc/NEWS index 81683c9..7e30651 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1? Core and Builtins ----------------- +- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is + passed to bytes or bytearray. + - Issue #7301: Add environment variable $PYTHONWARNINGS. - Issue #8329: Don't return the same lists from select.select when no fds are diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 8f833d8..4d32ea7 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -753,14 +753,18 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds) } /* Is it an int? */ - count = PyNumber_AsSsize_t(arg, PyExc_ValueError); - if (count == -1 && PyErr_Occurred()) - PyErr_Clear(); - else { - if (count < 0) { - PyErr_SetString(PyExc_ValueError, "negative count"); + count = PyNumber_AsSsize_t(arg, PyExc_OverflowError); + if (count == -1 && PyErr_Occurred()) { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) return -1; - } + else + PyErr_Clear(); + } + else if (count < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return -1; + } + else { if (count > 0) { if (PyByteArray_Resize((PyObject *)self, count)) return -1; diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 890d044..a05bf03 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2545,15 +2545,17 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return new; } /* Is it an integer? */ - size = PyNumber_AsSsize_t(x, PyExc_ValueError); + size = PyNumber_AsSsize_t(x, PyExc_OverflowError); if (size == -1 && PyErr_Occurred()) { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) + return NULL; PyErr_Clear(); } + else if (size < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return NULL; + } else { - if (size < 0) { - PyErr_SetString(PyExc_ValueError, "negative count"); - return NULL; - } new = PyBytes_FromStringAndSize(NULL, size); if (new == NULL) { return NULL; -- cgit v0.12