Mercurial > cpython-lru_cache-weakref
diff Python/random.c @ 75133:357e268e7c5f 2.6
ensure no one tries to hash things before the random seed is found
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Tue, 21 Feb 2012 11:08:50 -0500 |
| parents | 6b7704fe1be1 |
| children | edbf37ace03c |
line wrap: on
line diff
--- a/Python/random.c Tue Feb 21 10:22:34 2012 -0500 +++ b/Python/random.c Tue Feb 21 11:08:50 2012 -0500 @@ -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 @@ { 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