Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Rewrite the list_inline_repeat overflow check slightly differently.

This commit is contained in:
Guido van Rossum 2008-01-25 19:50:26 +00:00
parent 3dbd4c536d
commit 8d5cf4ed57
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Objects/listobject.c
View File

@ -502,7 +502,7 @@ list_repeat(PyListObject *a, Py_ssize_t n)
if (n && size/n != Py_SIZE(a)) if (n && size/n != Py_SIZE(a))
return PyErr_NoMemory(); return PyErr_NoMemory();
if (size == 0) if (size == 0)
return PyList_New(0); return PyList_New(0);
np = (PyListObject *) PyList_New(size); np = (PyListObject *) PyList_New(size);
if (np == NULL) if (np == NULL)
return NULL; return NULL;
@ -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)
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;