traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bug in PyZlib_flush. 

patch from Grzegorz Makarewicz & Rafal Smotrzyk.
This commit is contained in:
Jeremy Hylton 1999-01-06 22:56:24 +00:00
parent 015f22a0fa
commit 6892aa372d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/zlibmodule.c
View File

@ -530,7 +530,7 @@ PyZlib_flush(self, args)
/* When flushing the zstream, there's no input data. /* When flushing the zstream, there's no input data.
If zst.avail_out == 0, that means that more output space is If zst.avail_out == 0, that means that more output space is
needed to complete the flush operation. */ needed to complete the flush operation. */
do { while (err == Z_OK) {
err = deflate(&(self->zst), Z_FINISH); err = deflate(&(self->zst), Z_FINISH);
if (self->zst.avail_out <= 0) { if (self->zst.avail_out <= 0) {
if (_PyString_Resize(&RetVal, length << 1) == -1) { if (_PyString_Resize(&RetVal, length << 1) == -1) {
@ -542,9 +542,9 @@ PyZlib_flush(self, args)
self->zst.avail_out = length; self->zst.avail_out = length;
length = length << 1; length = length << 1;
} }
} while (self->zst.avail_out == 0); }
if (err!=Z_OK && err != Z_STREAM_END) if (err != Z_STREAM_END)
{ {
if (self->zst.msg == Z_NULL) if (self->zst.msg == Z_NULL)
PyErr_Format(ZlibError, "Error %i while flushing", PyErr_Format(ZlibError, "Error %i while flushing",
@ -554,7 +554,7 @@ PyZlib_flush(self, args)
err, self->zst.msg); err, self->zst.msg);
Py_DECREF(RetVal); Py_DECREF(RetVal);
return NULL; return NULL;
} }
if (flushmode == Z_FINISH) { if (flushmode == Z_FINISH) {
err=deflateEnd(&(self->zst)); err=deflateEnd(&(self->zst));
if (err!=Z_OK) { if (err!=Z_OK) {