summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2005-11-22 15:39:05 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2005-11-22 15:39:05 (GMT)
commit4e2a4ff6079db5e2115d8879fa511ecde161eae9 (patch)
treecf73e14f568de73d19e448c3773a93fd99df171a /Modules
parentc6f6cb74af3b07adb4da2172b128da51afe00ebe (diff)
downloadcpython-4e2a4ff6079db5e2115d8879fa511ecde161eae9.zip
cpython-4e2a4ff6079db5e2115d8879fa511ecde161eae9.tar.gz
cpython-4e2a4ff6079db5e2115d8879fa511ecde161eae9.tar.bz2
[Patch #1350573] zlib.crc32 doesn't handle 0xffffffff seed. Add tests and bugfix. Bug reported by John Schmidt; bugfix by Danny Yoo.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/zlibmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index c3238a0..a598ae3 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -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);