ensure no one tries to hash things before the random seed is found

diff --git a/Include/object.h b/Include/object.h
index 7848cf4c6ebdf8b89ecf13a62ea8d01e1bd8f528..dc589956bc2958d7cf0833ed04c1d35a1a067167 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -479,6 +479,10 @@ typedef struct {
 } _Py_HashSecret_t;
 PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret;
 
+#ifdef Py_DEBUG
+PyAPI_DATA(int) _Py_HashSecret_Initialized;
+#endif
+
 /* Helper for passing objects to printf and the like */
 #define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj))
 

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index f3103eaf69956a93e9ee0492de4f69f0ab22e4b2..5401068cbcc4233e5730e7a057ba49ea2b833435 100644 (file)
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -2565,6 +2565,7 @@ generic_hash(unsigned char *data, int len)
     register unsigned char *p;
     register long x;
 
+    assert(_Py_HashSecret_Initialized);
     p = (unsigned char *) data;
     x = _Py_HashSecret.prefix;
     x ^= *p << 7;

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index e6ab440caa952d74c05d19d42fb4d996652aa054..db93f37bacc4522856c263927fdd6b036c15eb31 100644 (file)
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -896,6 +896,7 @@ bytes_hash(PyBytesObject *a)
     register unsigned char *p;
     register long x;
 
+    assert(_Py_HashSecret_Initialized);
     if (a->ob_shash != -1)
         return a->ob_shash;
     len = Py_SIZE(a);

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5986fb8ea072b47e51fbcd0017d968215098f55b..2ec878f916a8ea3ae96661f7b13fdf1c20f623f7 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7341,6 +7341,7 @@ unicode_hash(PyUnicodeObject *self)
     Py_UNICODE *p;
     long x;
 
+    assert(_Py_HashSecret_Initialized);
     if (self->hash != -1)
         return self->hash;
     len = Py_SIZE(self);

diff --git a/Python/random.c b/Python/random.c
index 01cd83aa564cc8a2f91cc34bfb1ca1e1c65f1bf3..a2ae002261acdc5875b47d8193ed8bd7a628821f 100644 (file)
--- a/Python/random.c
+++ b/Python/random.c
@@ -5,7 +5,11 @@
 #include <fcntl.h>
 #endif
 
-static int random_initialized = 0;
+#ifdef Py_DEBUG
+int _Py_HashSecret_Initialized = 0;
+#else
+static int _Py_HashSecret_Initialized = 0;
+#endif
 
 #ifdef MS_WINDOWS
 typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\
@@ -246,11 +250,11 @@ _PyRandom_Init(void)
 {
     char *env;
     void *secret = &_Py_HashSecret;
-    Py_ssize_t secret_size = sizeof(_Py_HashSecret);
+    Py_ssize_t secret_size = sizeof(_Py_HashSecret_t);
 
-    if (random_initialized)
+    if (_Py_HashSecret_Initialized)
         return;
-    random_initialized = 1;
+    _Py_HashSecret_Initialized = 1;
 
     /*
       By default, hash randomization is disabled, and only