diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:09:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:09:13 (GMT) |
| commit | e249dcab7ad8b1bd3b84a44974cfe2746e4269d1 (patch) | |
| tree | eaf152bad01062780b3901e1c27ab6e2719b6eaf /Python | |
| parent | 4fe85abab9f0188733e654a72353217b43f95920 (diff) | |
| parent | 69e9727657dad167215b656de910d95cefe1ee45 (diff) | |
| download | cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.zip cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.tar.gz cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.tar.bz2 | |
merge 3.2
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 01cd83a..a2ae002 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 |