mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Fix the overflow checking of list_repeat.

Browse source 
Introduce overflow checking into list_inplace_repeat.

Backport candidate, possibly.
This commit is contained in:
Armin Rigo 2007-10-17 18:46:37 +00:00
parent 7b201162cf
commit a1e42e11d5
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_list.py
View file

@ -1,4 +1,5 @@
import unittest import unittest
import sys
from test import test_support, list_tests from test import test_support, list_tests
class ListTest(list_tests.CommonTest): class ListTest(list_tests.CommonTest):
@ -18,6 +19,14 @@ class ListTest(list_tests.CommonTest):
self.assertEqual(len([0]), 1) self.assertEqual(len([0]), 1)
self.assertEqual(len([0, 1, 2]), 3) self.assertEqual(len([0, 1, 2]), 3)
def test_overflow(self):
lst = [4, 5, 6, 7]
n = int((sys.maxint*2+2) // len(lst))
def mul(a, b): return a * b
def imul(a, b): a *= b
self.assertRaises((MemoryError, OverflowError), mul, lst, n)
self.assertRaises((MemoryError, OverflowError), imul, lst, n)
def test_main(verbose=None): def test_main(verbose=None):
test_support.run_unittest(ListTest) test_support.run_unittest(ListTest)

11
Objects/listobject.c
View file

@ -499,10 +499,10 @@ list_repeat(PyListObject *a, Py_ssize_t n)
if (n < 0) if (n < 0)
n = 0; n = 0;
size = Py_Size(a) * n; size = Py_Size(a) * n;
if (size == 0)
return PyList_New(0);
if (n && size/n != Py_Size(a)) if (n && size/n != Py_Size(a))
return PyErr_NoMemory(); return PyErr_NoMemory();
if (size == 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,7 +669,7 @@ 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; Py_ssize_t size, i, j, p, newsize;
size = PyList_GET_SIZE(self); size = PyList_GET_SIZE(self);
@ -684,7 +684,10 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n)
return (PyObject *)self; return (PyObject *)self;
} }
if (list_resize(self, size*n) == -1) newsize = size * n;
if (newsize/n != size)
return PyErr_NoMemory();
if (list_resize(self, newsize) == -1)
return NULL; return NULL;
p = size; p = size;