mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Issue #24620: Random.setstate() now validates the value of state last element.
This commit is contained in:
commit
c19bb3279c
3 changed files with 11 additions and 0 deletions
|
@ -338,6 +338,11 @@ class MersenneTwister_TestBasicOps(TestBasicOps, unittest.TestCase):
|
||||||
self.assertRaises(TypeError, self.gen.setstate, (2, ('a',)*625, None))
|
self.assertRaises(TypeError, self.gen.setstate, (2, ('a',)*625, None))
|
||||||
# Last element s/b an int also
|
# Last element s/b an int also
|
||||||
self.assertRaises(TypeError, self.gen.setstate, (2, (0,)*624+('a',), None))
|
self.assertRaises(TypeError, self.gen.setstate, (2, (0,)*624+('a',), None))
|
||||||
|
# Last element s/b between 0 and 624
|
||||||
|
with self.assertRaises((ValueError, OverflowError)):
|
||||||
|
self.gen.setstate((2, (1,)*624+(625,), None))
|
||||||
|
with self.assertRaises((ValueError, OverflowError)):
|
||||||
|
self.gen.setstate((2, (1,)*624+(-1,), None))
|
||||||
|
|
||||||
# Little trick to make "tuple(x % (2**32) for x in internalstate)"
|
# Little trick to make "tuple(x % (2**32) for x in internalstate)"
|
||||||
# raise ValueError. I cannot think of a simple way to achieve this, so
|
# raise ValueError. I cannot think of a simple way to achieve this, so
|
||||||
|
|
|
@ -28,6 +28,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #24620: Random.setstate() now validates the value of state last element.
|
||||||
|
|
||||||
- Issue #22485: Fixed an issue that caused `inspect.getsource` to return incorrect
|
- Issue #22485: Fixed an issue that caused `inspect.getsource` to return incorrect
|
||||||
results on nested functions.
|
results on nested functions.
|
||||||
|
|
||||||
|
|
|
@ -335,6 +335,10 @@ random_setstate(RandomObject *self, PyObject *state)
|
||||||
index = PyLong_AsLong(PyTuple_GET_ITEM(state, i));
|
index = PyLong_AsLong(PyTuple_GET_ITEM(state, i));
|
||||||
if (index == -1 && PyErr_Occurred())
|
if (index == -1 && PyErr_Occurred())
|
||||||
return NULL;
|
return NULL;
|
||||||
|
if (index < 0 || index > N) {
|
||||||
|
PyErr_SetString(PyExc_ValueError, "invalid state");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
self->index = (int)index;
|
self->index = (int)index;
|
||||||
|
|
||||||
Py_INCREF(Py_None);
|
Py_INCREF(Py_None);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue