Merge lp:~gz/brz/crc_asul into lp:brz

[Martin Packman]

Possible fix for OverflowError in _search_key_255

Possible fix for OverflowError in _search_key_255

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908984

[Jelmer Vernooij (jelmer)]

Thanks! Verified on armhf.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/73/

=== modified file 'breezy/bzr/_chk_map_pyx.pyx'
--- breezy/bzr/_chk_map_pyx.pyx	2018-07-12 01:43:49 +0000
+++ breezy/bzr/_chk_map_pyx.pyx	2018-11-17 18:22:51 +0000
@@ -41,7 +41,7 @@
     PyDict_SetItem,
     )
 from cpython.int cimport (
-    PyInt_AS_LONG,
+    PyInt_AsUnsignedLongMask,
     )
 from cpython.object cimport (
     PyObject,
@@ -102,7 +102,7 @@
         if i > 0:
             c_out[0] = c'\x00'
             c_out = c_out + 1
-        crc_val = PyInt_AS_LONG(crc32(key[i])) & <unsigned long>0xFFFFFFFF
+        crc_val = PyInt_AsUnsignedLongMask(crc32(key[i])) & 0xFFFFFFFFUL
         # Hex(val) order
         sprintf(c_out, '%08lX', crc_val)
         c_out = c_out + 8
@@ -127,7 +127,7 @@
         if i > 0:
             c_out[0] = c'\x00'
             c_out = c_out + 1
-        crc_val = PyInt_AS_LONG(crc32(key[i]))
+        crc_val = PyInt_AsUnsignedLongMask(crc32(key[i]))
         # MSB order
         c_out[0] = (crc_val >> 24) & 0xFF
         c_out[1] = (crc_val >> 16) & 0xFF