traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #25021: Merge 3.5 to default

This commit is contained in:
Kristján Valur Jónsson 2015-09-12 16:36:15 +00:00
parent 233cdb3e9c d7f65e5763
commit a8a930f863
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_itertools.py
View File

@ -1035,6 +1035,16 @@ class TestBasicOps(unittest.TestCase):
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
self.pickletest(proto, product(*args))
def test_product_issue_25021(self):
# test that indices are properly clamped to the length of the tuples
p = product((1, 2),(3,))
p.__setstate__((0, 0x1000)) # will access tuple element 1 if not clamped
self.assertEqual(next(p), (2, 3))
# test that empty tuple in the list will result in an immediate StopIteration
p = product((1, 2), (), (3,))
p.__setstate__((0, 0, 0x1000)) # will access tuple element 1 if not clamped
self.assertRaises(StopIteration, next, p)
def test_repeat(self):
self.assertEqual(list(repeat(object='a', times=3)), ['a', 'a', 'a'])
self.assertEqual(lzip(range(3),repeat('a')),

12
Modules/itertoolsmodule.c
View File

@ -2256,13 +2256,21 @@ product_setstate(productobject *lz, PyObject *state)
{
PyObject* indexObject = PyTuple_GET_ITEM(state, i);
Py_ssize_t index = PyLong_AsSsize_t(indexObject);
PyObject* pool;
Py_ssize_t poolsize;
if (index < 0 && PyErr_Occurred())
return NULL; /* not an integer */
pool = PyTuple_GET_ITEM(lz->pools, i);
poolsize = PyTuple_GET_SIZE(pool);
if (poolsize == 0) {
lz->stopped = 1;
Py_RETURN_NONE;
}
/* clamp the index */
if (index < 0)
index = 0;
else if (index > n-1)
index = n-1;
else if (index > poolsize-1)
index = poolsize-1;
lz->indices[i] = index;
}