diff options
| author | Mariatta <Mariatta@users.noreply.github.com> | 2017-05-27 14:19:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 14:19:55 (GMT) |
| commit | 1626a479e22db3d44bcd6736d571243433cb6d0e (patch) | |
| tree | 8cf90a3a5e48139c33497685ca661a17eb7bd6fb | |
| parent | 96f502059717a692ca3abd968b26c5ea2918ad3a (diff) | |
| download | cpython-1626a479e22db3d44bcd6736d571243433cb6d0e.zip cpython-1626a479e22db3d44bcd6736d571243433cb6d0e.tar.gz cpython-1626a479e22db3d44bcd6736d571243433cb6d0e.tar.bz2 | |
[2.7] bpo-29960 _random.Random corrupted on exception in setstate(). … (#1289)
(cherry picked from commit 9616a82e7802241a4b74cf7ae38d43c37bf66e48)
| -rw-r--r-- | Lib/test/test_random.py | 5 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_randommodule.c | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index e4876fd..90d334a 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -311,6 +311,7 @@ class MersenneTwister_TestBasicOps(TestBasicOps): self.assertRaises(ValueError, self.gen.setstate, (1, None, None)) def test_setstate_middle_arg(self): + start_state = self.gen.getstate() # Wrong type, s/b tuple self.assertRaises(TypeError, self.gen.setstate, (2, None, None)) # Wrong length, s/b 625 @@ -324,6 +325,10 @@ class MersenneTwister_TestBasicOps(TestBasicOps): self.gen.setstate((2, (1,)*624+(625,), None)) with self.assertRaises((ValueError, OverflowError)): self.gen.setstate((2, (1,)*624+(-1,), None)) + # Failed calls to setstate() should not have changed the state. + bits100 = self.gen.getrandbits(100) + self.gen.setstate(start_state) + self.assertEqual(self.gen.getrandbits(100), bits100) def test_referenceImplementation(self): # Compare the python implementation with results from the original @@ -1021,6 +1021,7 @@ Milan Oberkirch Pascal Oberndoerfer Jeffrey Ollie Adam Olsen +Bryan Olson Grant Olson Koray Oner Piet van Oostrum @@ -49,6 +49,9 @@ Extension Modules Library ------- +- bpo-29960: Preserve generator state when _random.Random.setstate() + raises an exception. Patch by Bryan Olson. + - bpo-30310: tkFont now supports unicode options (e.g. font family). - bpo-30414: multiprocessing.Queue._feed background running diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index 4b9b0eb..852b810 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -341,6 +341,7 @@ random_setstate(RandomObject *self, PyObject *state) int i; unsigned long element; long index; + unsigned long new_state[N]; if (!PyTuple_Check(state)) { PyErr_SetString(PyExc_TypeError, @@ -357,7 +358,7 @@ random_setstate(RandomObject *self, PyObject *state) element = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(state, i)); if (element == (unsigned long)-1 && PyErr_Occurred()) return NULL; - self->state[i] = element & 0xffffffffUL; /* Make sure we get sane state */ + new_state[i] = element & 0xffffffffUL; /* Make sure we get sane state */ } index = PyLong_AsLong(PyTuple_GET_ITEM(state, i)); @@ -368,6 +369,8 @@ random_setstate(RandomObject *self, PyObject *state) return NULL; } self->index = (int)index; + for (i = 0; i < N; i++) + self->state[i] = new_state[i]; Py_INCREF(Py_None); return Py_None; |