mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix SF bug #689659, 64-bit int and long hash keys incompatible

Browse source 
On a 64-bit machine, a dictionary could contain duplicate int/long keys
if the value was > 2**32.
This commit is contained in:
Neal Norwitz 2003-02-23 23:11:41 +00:00
parent 97e3f0060c
commit d5a65a77cf
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/longobject.c
View file

@ -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;