Kaydet (Commit) 8d5cf4ed authored tarafından Guido van Rossum's avatar Guido van Rossum

Rewrite the list_inline_repeat overflow check slightly differently.

üst 3dbd4c53
...@@ -669,11 +669,11 @@ static PyObject * ...@@ -669,11 +669,11 @@ static PyObject *
list_inplace_repeat(PyListObject *self, Py_ssize_t n) list_inplace_repeat(PyListObject *self, Py_ssize_t n)
{ {
PyObject **items; PyObject **items;
Py_ssize_t size, i, j, p, newsize; Py_ssize_t size, i, j, p;
size = PyList_GET_SIZE(self); size = PyList_GET_SIZE(self);
if (size == 0) { if (size == 0 || n == 1) {
Py_INCREF(self); Py_INCREF(self);
return (PyObject *)self; return (PyObject *)self;
} }
...@@ -684,10 +684,11 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n) ...@@ -684,10 +684,11 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n)
return (PyObject *)self; return (PyObject *)self;
} }
newsize = size * n; if (size > SSIZE_MAX / n) {
if (newsize/n != size)
return PyErr_NoMemory(); return PyErr_NoMemory();
if (list_resize(self, newsize) == -1) }
if (list_resize(self, size*n) == -1)
return NULL; return NULL;
p = size; p = size;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment