Backport issue #12973 list_repeat fix from 3.x.
This commit is contained in:
parent
dbbed04941
commit
4ac5d2cda4
|
@ -12,7 +12,9 @@ Core and Builtins
|
|||
- Issue #12973: Fix overflow checks that invoked undefined behaviour in
|
||||
int.__pow__. These overflow checks were causing int.__pow__ to produce
|
||||
incorrect results with recent versions of Clang, as a result of the
|
||||
compiler optimizing the check away.
|
||||
compiler optimizing the check away. Also fix similar overflow check
|
||||
in list_repeat (which caused test_list to fail with recent versions
|
||||
of Clang).
|
||||
|
||||
- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase
|
||||
titlecased and cased non-letter characters.
|
||||
|
|
|
@ -58,7 +58,7 @@ list_resize(PyListObject *self, Py_ssize_t newsize)
|
|||
if (newsize == 0)
|
||||
new_allocated = 0;
|
||||
items = self->ob_item;
|
||||
if (new_allocated <= ((~(size_t)0) / sizeof(PyObject *)))
|
||||
if (new_allocated <= (PY_SIZE_MAX / sizeof(PyObject *)))
|
||||
PyMem_RESIZE(items, PyObject *, new_allocated);
|
||||
else
|
||||
items = NULL;
|
||||
|
@ -551,9 +551,9 @@ list_repeat(PyListObject *a, Py_ssize_t n)
|
|||
PyObject *elem;
|
||||
if (n < 0)
|
||||
n = 0;
|
||||
size = Py_SIZE(a) * n;
|
||||
if (n && size/n != Py_SIZE(a))
|
||||
if (n > 0 && Py_SIZE(a) > PY_SSIZE_T_MAX / n)
|
||||
return PyErr_NoMemory();
|
||||
size = Py_SIZE(a) * n;
|
||||
if (size == 0)
|
||||
return PyList_New(0);
|
||||
np = (PyListObject *) PyList_New(size);
|
||||
|
|
Loading…
Reference in New Issue