Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Lib/test/test_range.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,16 @@ def test_iterator_setstate(self):
it.__setstate__(2**64 - 7)
self.assertEqual(list(it), [12, 10])

def test_iterator_invalid_setstate(self):
for invalid_value in (1.0, ""):
ranges = (('rangeiter', range(10, 100, 2)),
('longrangeiter', range(10, 2**65, 2)))
for rng_name, rng in ranges:
with self.subTest(invalid_value=invalid_value, range=rng_name):
it = iter(rng)
with self.assertRaises(TypeError):
it.__setstate__(invalid_value)

def test_odd_bug(self):
# This used to raise a "SystemError: NULL result without error"
# because the range validation step was eating the exception
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix the assertion failure in the ``__setstate__`` method of the range iterator
when a non-integer argument is passed. Patch by Sergey Miryanov.
5 changes: 5 additions & 0 deletions Objects/rangeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,11 @@ longrangeiter_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
static PyObject *
longrangeiter_setstate(PyObject *op, PyObject *state)
{
if (!PyLong_CheckExact(state)) {
PyErr_Format(PyExc_TypeError, "state must be an int, not %T", state);
return NULL;
}

longrangeiterobject *r = (longrangeiterobject*)op;
PyObject *zero = _PyLong_GetZero(); // borrowed reference
int cmp;
Expand Down
Loading