diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-07 17:08:54 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-07 17:08:54 (GMT) |
| commit | 4b3fe14d4bf56be8fb3e922052f0da65b6948a31 (patch) | |
| tree | a5cded081d9f1a53ebf2536f8da74d371d52d3e9 /Modules/zlibmodule.c | |
| parent | c5852813b8cba1cdd86f6a9f8a25239180f8c3be (diff) | |
| download | cpython-4b3fe14d4bf56be8fb3e922052f0da65b6948a31.zip cpython-4b3fe14d4bf56be8fb3e922052f0da65b6948a31.tar.gz cpython-4b3fe14d4bf56be8fb3e922052f0da65b6948a31.tar.bz2 | |
Merged revisions 80928 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80928 | antoine.pitrou | 2010-05-07 19:04:02 +0200 (ven., 07 mai 2010) | 11 lines
Merged revisions 80926 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80926 | antoine.pitrou | 2010-05-07 18:50:34 +0200 (ven., 07 mai 2010) | 5 lines
Issue #8571: Fix an internal error when compressing or decompressing a
chunk larger than 1GB with the zlib module's compressor and decompressor
objects.
........
................
Diffstat (limited to 'Modules/zlibmodule.c')
| -rw-r--r-- | Modules/zlibmodule.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index 2f2e214..353d11a 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -396,7 +396,8 @@ PyDoc_STRVAR(comp_compress__doc__, static PyObject * PyZlib_objcompress(compobject *self, PyObject *args) { - int err, inplen, length = DEFAULTALLOC; + int err, inplen; + Py_ssize_t length = DEFAULTALLOC; PyObject *RetVal; Py_buffer pinput; Byte *input; @@ -477,8 +478,8 @@ PyDoc_STRVAR(decomp_decompress__doc__, static PyObject * PyZlib_objdecompress(compobject *self, PyObject *args) { - int err, inplen, old_length, length = DEFAULTALLOC; - int max_length = 0; + int err, inplen, max_length = 0; + Py_ssize_t old_length, length = DEFAULTALLOC; PyObject *RetVal; Py_buffer pinput; Byte *input; |