diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2003-02-23 23:11:41 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2003-02-23 23:11:41 (GMT) |
| commit | d5a65a77cfdd81ad6945195c88e367fcd9f709c2 (patch) | |
| tree | ada89cc09c6e26fe8cc9f402840c738cc185bcd7 | |
| parent | 97e3f0060c2607ca784a1895e7eb01cda5751eb6 (diff) | |
| download | cpython-d5a65a77cfdd81ad6945195c88e367fcd9f709c2.zip cpython-d5a65a77cfdd81ad6945195c88e367fcd9f709c2.tar.gz cpython-d5a65a77cfdd81ad6945195c88e367fcd9f709c2.tar.bz2 | |
Fix SF bug #689659, 64-bit int and long hash keys incompatible
On a 64-bit machine, a dictionary could contain duplicate int/long keys
if the value was > 2**32.
| -rw-r--r-- | Lib/test/test_types.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/longobject.c | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 449d0dd..d571a02 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -639,6 +639,14 @@ try: d.pop(k) except KeyError: pass else: raise TestFailed, "{}.pop(k) doesn't raise KeyError when dictionary is empty" +# verify longs/ints get same value when key > 32 bits (for 64-bit archs) +# see SF bug #689659 +x = 4503599627370496L +y = 4503599627370496 +h = {x: 'anything', y: 'something else'} +if h[x] != h[y]: + raise TestFailed, "long/int key should match" + d[1] = 1 try: for i in d: @@ -12,7 +12,8 @@ What's New in Python 2.3 beta 1? Core and builtins ----------------- -TBD +- On 64-bit systems, a dictionary could contain duplicate long/int keys + if the key value was larger than 2**32. See SF bug #689659. Extension modules ----------------- diff --git a/Objects/longobject.c b/Objects/longobject.c index c2d6ea7..446affb 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -1490,11 +1490,13 @@ long_hash(PyLongObject *v) sign = -1; i = -(i); } +#define LONG_BIT_SHIFT (8*sizeof(long) - SHIFT) while (--i >= 0) { - /* Force a 32-bit circular shift */ - x = ((x << SHIFT) & ~MASK) | ((x >> (32-SHIFT)) & MASK); + /* Force a native long #-bits (32 or 64) circular shift */ + x = ((x << SHIFT) & ~MASK) | ((x >> LONG_BIT_SHIFT) & MASK); x += v->ob_digit[i]; } +#undef LONG_BIT_SHIFT x = x * sign; if (x == -1) x = -2; |