mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

zlib.crc32 and zlib.adler32 now return an unsigned value as any sane person

Browse source 
would expect.

Fixes issues1202.
This commit is contained in:
Gregory P. Smith 2008-03-17 20:24:09 +00:00
parent c55485bc6d
commit ab0d8a1f59
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/zlib.rst
View file

@ -42,6 +42,8 @@ The available exception and functions in this module are:
the algorithm is designed for use as a checksum algorithm, it is not suitable the algorithm is designed for use as a checksum algorithm, it is not suitable
for use as a general hash algorithm. for use as a general hash algorithm.
Always returns an unsigned 32-bit integer.
.. function:: compress(string[, level]) .. function:: compress(string[, level])
@ -74,6 +76,8 @@ The available exception and functions in this module are:
the algorithm is designed for use as a checksum algorithm, it is not suitable the algorithm is designed for use as a checksum algorithm, it is not suitable
for use as a general hash algorithm. for use as a general hash algorithm.
Always returns an unsigned 32-bit integer.
.. function:: decompress(string[, wbits[, bufsize]]) .. function:: decompress(string[, wbits[, bufsize]])

8
Lib/test/test_zlib.py
View file

@ -38,6 +38,14 @@ class ChecksumTestCase(unittest.TestCase):
self.assertEqual(zlib.crc32(b"penguin"), zlib.crc32(b"penguin", 0)) self.assertEqual(zlib.crc32(b"penguin"), zlib.crc32(b"penguin", 0))
self.assertEqual(zlib.adler32(b"penguin"),zlib.adler32(b"penguin",1)) self.assertEqual(zlib.adler32(b"penguin"),zlib.adler32(b"penguin",1))
def test_crc32_adler32_unsigned(self):
foo = 'abcdefghijklmnop'
# explicitly test signed behavior
self.assertEqual(zlib.crc32(foo), 2486878355)
self.assertEqual(zlib.crc32('spam'), 1138425661)
self.assertEqual(zlib.adler32(foo+foo), 3573550353)
self.assertEqual(zlib.adler32('spam'), 72286642)
class ExceptionTestCase(unittest.TestCase): class ExceptionTestCase(unittest.TestCase):

4
Modules/zlibmodule.c
View file

@ -922,7 +922,7 @@ PyZlib_adler32(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "s#|k:adler32", &buf, &len, &adler32val)) if (!PyArg_ParseTuple(args, "s#|k:adler32", &buf, &len, &adler32val))
return NULL; return NULL;
adler32val = adler32(adler32val, buf, len); adler32val = adler32(adler32val, buf, len);
return PyLong_FromLong(adler32val); return PyLong_FromUnsignedLong(adler32val & 0xffffffff);
} }
PyDoc_STRVAR(crc32__doc__, PyDoc_STRVAR(crc32__doc__,
@ -940,7 +940,7 @@ PyZlib_crc32(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "s#|k:crc32", &buf, &len, &crc32val)) if (!PyArg_ParseTuple(args, "s#|k:crc32", &buf, &len, &crc32val))
return NULL; return NULL;
crc32val = crc32(crc32val, buf, len); crc32val = crc32(crc32val, buf, len);
return PyLong_FromLong(crc32val); return PyLong_FromUnsignedLong(crc32val & 0xffffffff);
} }