From: Guido van Rossum Date: Fri, 25 Jan 2008 19:42:36 +0000 (+0000) Subject: Rewrite the list_inline_repeat overflow check slightly differently. X-Git-Tag: v2.5.2c1~47 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee6bab06d323b76a36833cbe65c857d279195e9a;p=python Rewrite the list_inline_repeat overflow check slightly differently. --- diff --git a/Objects/listobject.c b/Objects/listobject.c index c0d0e090df..10b099aecb 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -490,7 +490,7 @@ list_repeat(PyListObject *a, Py_ssize_t n) if (n && size/n != a->ob_size) return PyErr_NoMemory(); if (size == 0) - return PyList_New(0); + return PyList_New(0); np = (PyListObject *) PyList_New(size); if (np == NULL) return NULL; @@ -672,10 +672,11 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n) return (PyObject *)self; } - p = size*n; - if (p/n != size) + if (size > SSIZE_MAX / n) { return PyErr_NoMemory(); - if (list_resize(self, p) == -1) + } + + if (list_resize(self, size*n) == -1) return NULL; p = size;