changeset:   97037:0933c00c2765
branch:      3.4
parent:      97029:13af5c3414b5
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Fri Jul 24 09:02:53 2015 +0300
files:       Lib/test/test_random.py Misc/NEWS Modules/_randommodule.c
description:
Issue #24620: Random.setstate() now validates the value of state last element.


diff -r 13af5c3414b5 -r 0933c00c2765 Lib/test/test_random.py
--- a/Lib/test/test_random.py	Fri Jul 24 04:09:59 2015 +1200
+++ b/Lib/test/test_random.py	Fri Jul 24 09:02:53 2015 +0300
@@ -338,6 +338,11 @@
         self.assertRaises(TypeError, self.gen.setstate, (2, ('a',)*625, None))
         # Last element s/b an int also
         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)"
         # raise ValueError. I cannot think of a simple way to achieve this, so
diff -r 13af5c3414b5 -r 0933c00c2765 Misc/NEWS
--- a/Misc/NEWS	Fri Jul 24 04:09:59 2015 +1200
+++ b/Misc/NEWS	Fri Jul 24 09:02:53 2015 +0300
@@ -66,6 +66,8 @@
 Library
 -------
 
+- Issue #24620: Random.setstate() now validates the value of state last element.
+
 - Issue #22153: Improve unittest docs. Patch from Martin Panter and evilzero.
 
 - Issue #24206: Fixed __eq__ and __ne__ methods of inspect classes.
diff -r 13af5c3414b5 -r 0933c00c2765 Modules/_randommodule.c
--- a/Modules/_randommodule.c	Fri Jul 24 04:09:59 2015 +1200
+++ b/Modules/_randommodule.c	Fri Jul 24 09:02:53 2015 +0300
@@ -340,6 +340,10 @@
     index = PyLong_AsLong(PyTuple_GET_ITEM(state, i));
     if (index == -1 && PyErr_Occurred())
         return NULL;
+    if (index < 0 || index > N) {
+        PyErr_SetString(PyExc_ValueError, "invalid state");
+        return NULL;
+    }
     self->index = (int)index;
 
     Py_INCREF(Py_None);