From d3c9624801389156837b6fa10f929051c3f18050 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 10 Mar 2020 12:48:20 +0100 Subject: [PATCH] bpo-38075: Fix random_seed(): use PyObject_CallOneArg() Fix the random.Random.seed() method when a bool is passed as the seed. PyObject_Vectorcall() was misused. Use PyObject_CallOneArg() instead. --- Lib/test/test_random.py | 2 +- .../next/Library/2020-03-10-12-52-06.bpo-38075.qbESAF.rst | 2 ++ Modules/_randommodule.c | 5 +---- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2020-03-10-12-52-06.bpo-38075.qbESAF.rst diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index 2c8c8e885452ad..c147105376199a 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -42,7 +42,7 @@ class MySeed(object): def __hash__(self): return -1729 for arg in [None, 0, 1, -1, 10**20, -(10**20), - 3.14, 'a']: + False, True, 3.14, 'a']: self.gen.seed(arg) for arg in [1+2j, tuple('abc'), MySeed()]: diff --git a/Misc/NEWS.d/next/Library/2020-03-10-12-52-06.bpo-38075.qbESAF.rst b/Misc/NEWS.d/next/Library/2020-03-10-12-52-06.bpo-38075.qbESAF.rst new file mode 100644 index 00000000000000..df52fcc275b0af --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-03-10-12-52-06.bpo-38075.qbESAF.rst @@ -0,0 +1,2 @@ +Fix the :meth:`random.Random.seed` method when a :class:`bool` is passed as the +seed. diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index f0fdb0382c5d35..7a8871868e639b 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -264,7 +264,6 @@ random_seed(RandomObject *self, PyObject *arg) uint32_t *key = NULL; size_t bits, keyused; int res; - PyObject *args[1]; if (arg == NULL || arg == Py_None) { if (random_seed_urandom(self) < 0) { @@ -286,9 +285,7 @@ random_seed(RandomObject *self, PyObject *arg) } else if (PyLong_Check(arg)) { /* Calling int.__abs__() prevents calling arg.__abs__(), which might return an invalid value. See issue #31478. */ - args[0] = arg; - n = PyObject_Vectorcall(_randomstate_global->Long___abs__, args, 0, - NULL); + n = PyObject_CallOneArg(_randomstate_global->Long___abs__, arg); } else { Py_hash_t hash = PyObject_Hash(arg);