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:09:13 -05:00
parent 4fe85abab9 69e9727657
commit e249dcab7a
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/object.h
View File

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

1
Modules/_datetimemodule.c
View File

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

1
Objects/bytesobject.c
View File

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

1
Objects/unicodeobject.c
View File

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

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