diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 11:08:50 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 11:08:50 -0500 |
| commit | 64adc7fe1df0af55c913a6169c87ebb43b7961b2 (patch) | |
| tree | fae69ca093bb1d271dd7be55390f8292828490e6 /Python | |
| parent | 52c44306347c411bb632e5cb829c265c0d71c025 (diff) | |
| download | cpython-64adc7fe1df0af55c913a6169c87ebb43b7961b2.tar.gz | |
ensure no one tries to hash things before the random seed is found
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/random.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Python/random.c b/Python/random.c index 01cd83aa56..a2ae002261 100644 --- 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 |