diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-10-06 17:05:14 (GMT) |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-10-06 17:05:14 (GMT) |
| commit | ff9c54aca28592a3eab0bdba1ddd977b441e1e9f (patch) | |
| tree | 9ffb1c0c0b9aad8615cfae28c3ebbea5c67c4752 /Modules/arraymodule.c | |
| parent | 7e3cde590140052776ad219817e7bd7b87e3d4cd (diff) | |
| parent | c04ddff290fc203d05b75c8569b748525fb76b5b (diff) | |
| download | cpython-ff9c54aca28592a3eab0bdba1ddd977b441e1e9f.zip cpython-ff9c54aca28592a3eab0bdba1ddd977b441e1e9f.tar.gz cpython-ff9c54aca28592a3eab0bdba1ddd977b441e1e9f.tar.bz2 | |
Issue #16096: Merge fixes from 3.3.
Diffstat (limited to 'Modules/arraymodule.c')
| -rw-r--r-- | Modules/arraymodule.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index 04eb67c..3f5aa8b 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -483,11 +483,11 @@ newarrayobject(PyTypeObject *type, Py_ssize_t size, struct arraydescr *descr) return NULL; } - nbytes = size * descr->itemsize; /* Check for overflow */ - if (nbytes / descr->itemsize != (size_t)size) { + if (size > PY_SSIZE_T_MAX / descr->itemsize) { return PyErr_NoMemory(); } + nbytes = size * descr->itemsize; op = (arrayobject *) type->tp_alloc(type, 0); if (op == NULL) { return NULL; @@ -1251,11 +1251,15 @@ array_fromfile(arrayobject *self, PyObject *args) if (!PyArg_ParseTuple(args, "On:fromfile", &f, &n)) return NULL; - nbytes = n * itemsize; - if (nbytes < 0 || nbytes/itemsize != n) { + if (n < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return NULL; + } + if (n > PY_SSIZE_T_MAX / itemsize) { PyErr_NoMemory(); return NULL; } + nbytes = n * itemsize; b = _PyObject_CallMethodId(f, &PyId_read, "n", nbytes); if (b == NULL) |