Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.2

This commit is contained in:
Benjamin Peterson 2012-02-21 11:12:14 -05:00
parent 8b24506534 e249dcab7a
commit d9a3591ed1
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/object.h
View File

@ -560,6 +560,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))

1
Objects/object.c
View File

@ -763,6 +763,7 @@ _Py_HashBytes(unsigned char *p, Py_ssize_t len)
We make the hash of the empty string be 0, rather than using
(prefix ^ suffix), since this slightly obfuscates the hash secret
*/
assert(_Py_HashSecret_Initialized);
if (len == 0) {
return 0;
}

1
Objects/unicodeobject.c
View File

@ -11214,6 +11214,7 @@ unicode_hash(PyObject *self)
Py_ssize_t len;
Py_uhash_t x;
assert(_Py_HashSecret_Initialized);
if (_PyUnicode_HASH(self) != -1)
return _PyUnicode_HASH(self);
if (PyUnicode_READY(self) == -1)

12
Python/random.c
View File

@ -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