Kaydet (Commit) bb7e8005 authored tarafından Andrew M. Kuchling's avatar Andrew M. Kuchling

[Patch #1350573] zlib.crc32 doesn't handle 0xffffffff seed. Add tests and…

[Patch #1350573] zlib.crc32 doesn't handle 0xffffffff seed.  Add tests and bugfix.  Bug reported by John Schmidt; bugfix by Danny Yoo.
üst b2a739d1
......@@ -24,6 +24,7 @@ class ChecksumTestCase(unittest.TestCase):
# checksum test cases
def test_crc32start(self):
self.assertEqual(zlib.crc32(""), zlib.crc32("", 0))
self.assert_(zlib.crc32("abc", 0xffffffff))
def test_crc32empty(self):
self.assertEqual(zlib.crc32("", 0), 0)
......@@ -32,6 +33,7 @@ class ChecksumTestCase(unittest.TestCase):
def test_adler32start(self):
self.assertEqual(zlib.adler32(""), zlib.adler32("", 1))
self.assert_(zlib.adler32("abc", 0xffffffff))
def test_adler32empty(self):
self.assertEqual(zlib.adler32("", 0), 0)
......
......@@ -778,7 +778,7 @@ PyZlib_adler32(PyObject *self, PyObject *args)
Byte *buf;
int len;
if (!PyArg_ParseTuple(args, "s#|l:adler32", &buf, &len, &adler32val))
if (!PyArg_ParseTuple(args, "s#|k:adler32", &buf, &len, &adler32val))
return NULL;
adler32val = adler32(adler32val, buf, len);
return PyInt_FromLong(adler32val);
......@@ -796,7 +796,7 @@ PyZlib_crc32(PyObject *self, PyObject *args)
uLong crc32val = crc32(0L, Z_NULL, 0);
Byte *buf;
int len;
if (!PyArg_ParseTuple(args, "s#|l:crc32", &buf, &len, &crc32val))
if (!PyArg_ParseTuple(args, "s#|k:crc32", &buf, &len, &crc32val))
return NULL;
crc32val = crc32(crc32val, buf, len);
return PyInt_FromLong(crc32val);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment