From 26da920001941b0cd74981772924a6aab4d2881a Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 21 Feb 2012 11:08:50 -0500 Subject: ensure no one tries to hash things before the random seed is found --- Include/object.h | 4 ++++ Objects/stringobject.c | 1 + Objects/unicodeobject.c | 1 + Python/random.c | 12 ++++++++---- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Include/object.h b/Include/object.h index 0b7d41d..c0601c5 100644 --- a/Include/object.h +++ b/Include/object.h @@ -512,6 +512,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) PyString_AS_STRING(PyObject_Repr(obj)) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 9e2673d..9d05866 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1209,6 +1209,7 @@ string_hash(PyStringObject *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 2f80e59..1df38e8 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -6692,6 +6692,7 @@ unicode_hash(PyUnicodeObject *self) register Py_UNICODE *p; register long x; + assert(_Py_HashSecret_Initialized); if (self->hash != -1) return self->hash; len = PyUnicode_GET_SIZE(self); diff --git a/Python/random.c b/Python/random.c index 01cd83a..a2ae002 100644 --- a/Python/random.c +++ b/Python/random.c @@ -5,7 +5,11 @@ #include #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 -- cgit v0.12