mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.2

Browse source
This commit is contained in:
Benjamin Peterson 2012-02-21 11:09:13 -05:00
commit e249dcab7a
5 changed files with 15 additions and 4 deletions
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; } _Py_HashSecret_t;
PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret; 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 */ /* Helper for passing objects to printf and the like */
#define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj)) #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 unsigned char *p;
register Py_hash_t x; register Py_hash_t x;
assert(_Py_HashSecret_Initialized);
p = (unsigned char *) data; p = (unsigned char *) data;
x = _Py_HashSecret.prefix; x = _Py_HashSecret.prefix;
x ^= *p << 7; x ^= *p << 7;

1
Objects/bytesobject.c
View file

@ -875,6 +875,7 @@ bytes_hash(PyBytesObject *a)
register unsigned char *p; register unsigned char *p;
register Py_hash_t x; register Py_hash_t x;
assert(_Py_HashSecret_Initialized);
if (a->ob_shash != -1) if (a->ob_shash != -1)
return a->ob_shash; return a->ob_shash;
len = Py_SIZE(a); len = Py_SIZE(a);

1
Objects/unicodeobject.c
View file

@ -7673,6 +7673,7 @@ unicode_hash(PyUnicodeObject *self)
Py_UNICODE *p; Py_UNICODE *p;
Py_hash_t x; Py_hash_t x;
assert(_Py_HashSecret_Initialized);
if (self->hash != -1) if (self->hash != -1)
return self->hash; return self->hash;
len = Py_SIZE(self); len = Py_SIZE(self);

12
Python/random.c
View file

@ -5,7 +5,11 @@
#include <fcntl.h> #include <fcntl.h>
#endif #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 #ifdef MS_WINDOWS
typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\ typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv,\
@ -246,11 +250,11 @@ _PyRandom_Init(void)
{ {
char *env; char *env;
void *secret = &_Py_HashSecret; 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; return;
random_initialized = 1; _Py_HashSecret_Initialized = 1;
/* /*
By default, hash randomization is disabled, and only By default, hash randomization is disabled, and only