diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-16 22:51:37 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-16 22:51:37 (GMT) |
| commit | 8380dd5aa42372929fe962ebdc3c180d929e497a (patch) | |
| tree | 8d26a672eb08d5069ca549fb265d2e012363b657 /Objects/bytesobject.c | |
| parent | 4c04583e790c424b9360774fe7055576e925b534 (diff) | |
| download | cpython-8380dd5aa42372929fe962ebdc3c180d929e497a.zip cpython-8380dd5aa42372929fe962ebdc3c180d929e497a.tar.gz cpython-8380dd5aa42372929fe962ebdc3c180d929e497a.tar.bz2 | |
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
........
Diffstat (limited to 'Objects/bytesobject.c')
| -rw-r--r-- | Objects/bytesobject.c | 12 |
1 files changed, 7 insertions, 5 deletions
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; |