changeset:   88875:caebb4f231da
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Sat Feb 01 03:38:56 2014 +0100
files:       Misc/NEWS Python/pyhash.c
description:
Issue #20162: Fix an alignment issue in the siphash24() hash function which
caused a crash on PowerPC 64-bit (ppc64).


diff -r a3b4f4b1aedd -r caebb4f231da Misc/NEWS
--- a/Misc/NEWS	Sat Feb 01 03:18:58 2014 +0100
+++ b/Misc/NEWS	Sat Feb 01 03:38:56 2014 +0100
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #20162: Fix an alignment issue in the siphash24() hash function which
+  caused a crash on PowerPC 64-bit (ppc64).
+
 Library
 -------
 
diff -r a3b4f4b1aedd -r caebb4f231da Python/pyhash.c
--- a/Python/pyhash.c	Sat Feb 01 03:18:58 2014 +0100
+++ b/Python/pyhash.c	Sat Feb 01 03:38:56 2014 +0100
@@ -399,7 +399,7 @@
         case 7: pt[6] = m[6];
         case 6: pt[5] = m[5];
         case 5: pt[4] = m[4];
-        case 4: *((PY_UINT32_T*)&pt[0]) = *((PY_UINT32_T*)&m[0]); break;
+        case 4: Py_MEMCPY(pt, m, sizeof(PY_UINT32_T)); break;
         case 3: pt[2] = m[2];
         case 2: pt[1] = m[1];
         case 1: pt[0] = m[0];