Mercurial > cpython-lru_cache-weakref
diff Objects/bytesobject.c @ 72464:698fa089ce70
Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__, tuple.__hash__, frozenset.__hash__ and set indexing operations.
| author | Mark Dickinson <mdickinson@enthought.com> |
|---|---|
| date | Sat, 24 Sep 2011 18:18:40 +0100 |
| parents | 0b2660384d4e |
| children | 8beaa9a37387 |
line wrap: on
line diff
--- a/Objects/bytesobject.c Sat Sep 24 16:24:56 2011 +0100 +++ b/Objects/bytesobject.c Sat Sep 24 18:18:40 2011 +0100 @@ -869,16 +869,16 @@ { register Py_ssize_t len; register unsigned char *p; - register Py_hash_t x; + register Py_uhash_t x; if (a->ob_shash != -1) return a->ob_shash; len = Py_SIZE(a); p = (unsigned char *) a->ob_sval; - x = *p << 7; + x = (Py_uhash_t)*p << 7; while (--len >= 0) - x = (1000003*x) ^ *p++; - x ^= Py_SIZE(a); + x = (1000003U*x) ^ (Py_uhash_t)*p++; + x ^= (Py_uhash_t)Py_SIZE(a); if (x == -1) x = -2; a->ob_shash = x;
