summaryrefslogtreecommitdiffstats
path: root/Objects/stringobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-21 16:24:21 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-02-21 16:24:21 (GMT)
commit9d7601fcea7c9cee6132c4a4dffb482cfa351785 (patch)
treebbcac236f3ba1983cf2c8f0f95ef38fea2cb8471 /Objects/stringobject.c
parentdbe0329d4c7f31618d913a1e8c233239e05a54eb (diff)
parent876e789f650a68b1fe05be7060794357cf13e3d3 (diff)
downloadcpython-9d7601fcea7c9cee6132c4a4dffb482cfa351785.zip
cpython-9d7601fcea7c9cee6132c4a4dffb482cfa351785.tar.gz
cpython-9d7601fcea7c9cee6132c4a4dffb482cfa351785.tar.bz2
merge 2.6
Diffstat (limited to 'Objects/stringobject.c')
-rw-r--r--Objects/stringobject.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 49d1864..9826792 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -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);