Skip to content

Commit 10bec7c

Browse files
GH-141312: Allow only integers to longrangeiter_setstate state (GH-141317)
This fixes an assertion error when the new computed start is not an integer.
1 parent 49e7421 commit 10bec7c

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

Lib/test/test_range.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,16 @@ def test_iterator_setstate(self):
470470
it.__setstate__(2**64 - 7)
471471
self.assertEqual(list(it), [12, 10])
472472

473+
def test_iterator_invalid_setstate(self):
474+
for invalid_value in (1.0, ""):
475+
ranges = (('rangeiter', range(10, 100, 2)),
476+
('longrangeiter', range(10, 2**65, 2)))
477+
for rng_name, rng in ranges:
478+
with self.subTest(invalid_value=invalid_value, range=rng_name):
479+
it = iter(rng)
480+
with self.assertRaises(TypeError):
481+
it.__setstate__(invalid_value)
482+
473483
def test_odd_bug(self):
474484
# This used to raise a "SystemError: NULL result without error"
475485
# because the range validation step was eating the exception
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix the assertion failure in the ``__setstate__`` method of the range iterator
2+
when a non-integer argument is passed. Patch by Sergey Miryanov.

Objects/rangeobject.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,11 @@ longrangeiter_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
10421042
static PyObject *
10431043
longrangeiter_setstate(PyObject *op, PyObject *state)
10441044
{
1045+
if (!PyLong_CheckExact(state)) {
1046+
PyErr_Format(PyExc_TypeError, "state must be an int, not %T", state);
1047+
return NULL;
1048+
}
1049+
10451050
longrangeiterobject *r = (longrangeiterobject*)op;
10461051
PyObject *zero = _PyLong_GetZero(); // borrowed reference
10471052
int cmp;

0 commit comments

Comments
 (0)