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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-05-07 17:08:54 +00:00
parent c5852813b8
commit 4b3fe14d4b
3 changed files with 67 additions and 5 deletions

View file

@ -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;