mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-28 12:31:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge 2.6

Browse Source
This commit is contained in:
Benjamin Peterson 2012-02-21 11:24:21 -05:00
commit 9d7601fcea
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

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

1
Objects/stringobject.c
View File

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

1
Objects/unicodeobject.c
View File

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

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