summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-04-16 22:35:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-04-16 22:35:38 (GMT)
commit821a8ea39fb93095cc06c0cd9ef4ce498af73ab3 (patch)
tree14a918a5546598aa71781865dcc4cd9e7790c2b4 /Objects
parent5c4e292c14b71bfecb45e39f501329a71254b2cc (diff)
downloadcpython-821a8ea39fb93095cc06c0cd9ef4ce498af73ab3.zip
cpython-821a8ea39fb93095cc06c0cd9ef4ce498af73ab3.tar.gz
cpython-821a8ea39fb93095cc06c0cd9ef4ce498af73ab3.tar.bz2
have a clear error when passing something > sys.maxsize to bytearray
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytearrayobject.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 699dec9..61fe8de 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -824,14 +824,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;