summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-07 16:50:34 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-07 16:50:34 (GMT)
commit3843cd8e86673ce8969c6e948cd15735168882d3 (patch)
tree50bde3198b1e1ddb3382c8d12859b7ccfb3eac6c /Modules
parent4fedbce55a41126f34e18f3ccf8d51960dda5d75 (diff)
downloadcpython-3843cd8e86673ce8969c6e948cd15735168882d3.zip
cpython-3843cd8e86673ce8969c6e948cd15735168882d3.tar.gz
cpython-3843cd8e86673ce8969c6e948cd15735168882d3.tar.bz2
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')
-rw-r--r--Modules/zlibmodule.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 4f78dbc..0cb1e64 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -392,7 +392,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;
Byte *input;
unsigned long start_total_out;
@@ -461,8 +462,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;
Byte *input;
unsigned long start_total_out;