mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 22:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

ensure no one tries to hash things before the random seed is found

Browse source
This commit is contained in:
Benjamin Peterson 2012-02-21 11:08:50 -05:00
parent b69fa1f8b7
commit 26da920001
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/object.h
View file

@ -512,6 +512,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) PyString_AS_STRING(PyObject_Repr(obj)) #define PyObject_REPR(obj) PyString_AS_STRING(PyObject_Repr(obj))

1
Objects/stringobject.c
View file

@ -1209,6 +1209,7 @@ string_hash(PyStringObject *a)
register unsigned char *p; register unsigned char *p;
register long x; register long 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

@ -6692,6 +6692,7 @@ unicode_hash(PyUnicodeObject *self)
register Py_UNICODE *p; register Py_UNICODE *p;
register long x; register long x;
assert(_Py_HashSecret_Initialized);
if (self->hash != -1) if (self->hash != -1)
return self->hash; return self->hash;
len = PyUnicode_GET_SIZE(self); len = PyUnicode_GET_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