changeset:   97039:d8229c26dd92
branch:      3.5
parent:      97032:5400e21e92a7
parent:      97037:0933c00c2765
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Fri Jul 24 09:05:59 2015 +0300
files:       Misc/NEWS Modules/_randommodule.c
description:
Issue #24620: Random.setstate() now validates the value of state last element.


diff -r 5400e21e92a7 -r d8229c26dd92 Lib/test/test_random.py
--- a/Lib/test/test_random.py	Thu Jul 23 22:49:37 2015 -0500
+++ b/Lib/test/test_random.py	Fri Jul 24 09:05:59 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 5400e21e92a7 -r d8229c26dd92 Misc/NEWS
--- a/Misc/NEWS	Thu Jul 23 22:49:37 2015 -0500
+++ b/Misc/NEWS	Fri Jul 24 09:05:59 2015 +0300
@@ -28,6 +28,8 @@
 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
   results on nested functions.
 
diff -r 5400e21e92a7 -r d8229c26dd92 Modules/_randommodule.c
--- a/Modules/_randommodule.c	Thu Jul 23 22:49:37 2015 -0500
+++ b/Modules/_randommodule.c	Fri Jul 24 09:05:59 2015 +0300
@@ -335,6 +335,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);