[Python-checkins] cpython (merge 2.6 -> 2.7): merge 2.6

[benjamin.peterson]

http://hg.python.org/cpython/rev/40b684215b4f
changeset:   75135:40b684215b4f
branch:      2.7
parent:      75132:91d6f312e0c3
parent:      75134:54a78290a75d
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Feb 21 11:24:21 2012 -0500
summary:
  merge 2.6

files:
  Include/object.h        |   4 ++++
  Objects/stringobject.c  |   1 +
  Objects/unicodeobject.c |   1 +
  Python/random.c         |  12 ++++++++----
  4 files changed, 14 insertions(+), 4 deletions(-)


diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -523,6 +523,10 @@
 } _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))
 
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1262,6 +1262,7 @@
     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
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6538,6 +6538,7 @@
     register Py_UNICODE *p;
     register long x;
 
+    assert(_Py_HashSecret_Initialized);
     if (self->hash != -1)
         return self->hash;
     len = PyUnicode_GET_SIZE(self);
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -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 @@
 {
     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

-- 
Repository URL: http://hg.python.org/cpython