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 | |
| parent | 4fe85abab9f0188733e654a72353217b43f95920 (diff) | |
| parent | 69e9727657dad167215b656de910d95cefe1ee45 (diff) | |
| download | cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.zip cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.tar.gz cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.tar.bz2 | |
merge 3.2
| -rw-r--r-- | Include/object.h | 4 | ||||
| -rw-r--r-- | Modules/_datetimemodule.c | 1 | ||||
| -rw-r--r-- | Objects/bytesobject.c | 1 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 1 | ||||
| -rw-r--r-- | Python/random.c | 12 |
5 files changed, 15 insertions, 4 deletions
diff --git a/Include/object.h b/Include/object.h index a54c400..315766c 100644 --- a/Include/object.h +++ b/Include/object.h @@ -523,6 +523,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 85c5c4d..8f571ad 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -2784,6 +2784,7 @@ generic_hash(unsigned char *data, int len) register unsigned char *p; register Py_hash_t 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 d63fabc..62ddf21 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -875,6 +875,7 @@ bytes_hash(PyBytesObject *a) register unsigned char *p; register Py_hash_t 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 467f95c..b706661 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7673,6 +7673,7 @@ unicode_hash(PyUnicodeObject *self) Py_UNICODE *p; Py_hash_t 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 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 |