diff Modules/zlibmodule.c @ 61369:f18981904507 2.6

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. ........
author Antoine Pitrou <solipsis@pitrou.net>
date Fri, 07 May 2010 16:59:00 +0000
parents 52294af4b663
children fd25030223b0
line wrap: on
line diff
--- a/Modules/zlibmodule.c	Fri May 07 13:23:18 2010 +0000
+++ b/Modules/zlibmodule.c	Fri May 07 16:59:00 2010 +0000
@@ -392,7 +392,8 @@
 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 @@
 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;