summaryrefslogtreecommitdiffstats
path: root/Modules/_ssl.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-19 15:47:25 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-12-19 15:47:25 (GMT)
commit36e96b87165c4050eea5aa70d9538d237c874b33 (patch)
tree7b18f824421e63d2a7fae79ff3dedb498b3c1306 /Modules/_ssl.c
parentc234f185cb37e945f29a702ac5f7a149236f8c65 (diff)
parent1e81a399a25edd23d76601c0c421bdad46b5c19c (diff)
downloadcpython-36e96b87165c4050eea5aa70d9538d237c874b33.zip
cpython-36e96b87165c4050eea5aa70d9538d237c874b33.tar.gz
cpython-36e96b87165c4050eea5aa70d9538d237c874b33.tar.bz2
(Merge 3.3) Issue #20025: ssl.RAND_bytes() and ssl.RAND_pseudo_bytes() now
raise a ValueError if num is negative (instead of raising a SystemError).
Diffstat (limited to 'Modules/_ssl.c')
-rw-r--r--Modules/_ssl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 6b0d67a..a370b1b 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3244,6 +3244,11 @@ PySSL_RAND(int len, int pseudo)
const char *errstr;
PyObject *v;
+ if (len < 0) {
+ PyErr_SetString(PyExc_ValueError, "num must be positive");
+ return NULL;
+ }
+
bytes = PyBytes_FromStringAndSize(NULL, len);
if (bytes == NULL)
return NULL;