diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:24:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:24:21 (GMT) |
| commit | 9d7601fcea7c9cee6132c4a4dffb482cfa351785 (patch) | |
| tree | bbcac236f3ba1983cf2c8f0f95ef38fea2cb8471 | |
| parent | dbe0329d4c7f31618d913a1e8c233239e05a54eb (diff) | |
| parent | 876e789f650a68b1fe05be7060794357cf13e3d3 (diff) | |
| download | cpython-9d7601fcea7c9cee6132c4a4dffb482cfa351785.zip cpython-9d7601fcea7c9cee6132c4a4dffb482cfa351785.tar.gz cpython-9d7601fcea7c9cee6132c4a4dffb482cfa351785.tar.bz2 | |
merge 2.6
| -rw-r--r-- | Include/object.h | 4 | ||||
| -rw-r--r-- | Objects/stringobject.c | 1 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 1 | ||||
| -rw-r--r-- | Python/random.c | 12 |
4 files changed, 14 insertions, 4 deletions
diff --git a/Include/object.h b/Include/object.h index c24ea7f..edcd3fc 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) PyString_AS_STRING(PyObject_Repr(obj)) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 49d1864..9826792 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1262,6 +1262,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 a65deff..4fb1aed 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -6538,6 +6538,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 <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 |