summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-21 16:08:50 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-02-21 16:08:50 (GMT)
commit69e9727657dad167215b656de910d95cefe1ee45 (patch)
treee90351e4f45e2f07dbd3bb4c877da686075fec1e /Objects
parent9571155ae4ff86b4275950fcdfadcc76475943e3 (diff)
downloadcpython-69e9727657dad167215b656de910d95cefe1ee45.zip
cpython-69e9727657dad167215b656de910d95cefe1ee45.tar.gz
cpython-69e9727657dad167215b656de910d95cefe1ee45.tar.bz2
ensure no one tries to hash things before the random seed is found
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c1
-rw-r--r--Objects/unicodeobject.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index e6ab440..db93f37 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -896,6 +896,7 @@ bytes_hash(PyBytesObject *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);
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 5986fb8..2ec878f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7341,6 +7341,7 @@ unicode_hash(PyUnicodeObject *self)
Py_UNICODE *p;
long x;
+ assert(_Py_HashSecret_Initialized);
if (self->hash != -1)
return self->hash;
len = Py_SIZE(self);