mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed the flush() method of compression objects; the test for

Browse source 
the end of loop was incorrect, and failed when the flushmode != Z_FINISH.
    Logic cleaned up and commented.
This commit is contained in:
Andrew M. Kuchling 1999-03-22 19:25:30 +00:00
parent dca7e00fd5
commit 173156fa32
1 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Modules/zlibmodule.c
View file

@ -541,21 +541,34 @@ 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. */
while (err == Z_OK) { while (1) {
err = deflate(&(self->zst), Z_FINISH); err = deflate(&(self->zst), flushmode);
if (self->zst.avail_out <= 0) {
if (_PyString_Resize(&RetVal, length << 1) == -1) { /* If the output is Z_OK, and there's still room in the output
PyErr_SetString(PyExc_MemoryError, buffer, then the flush is complete. */
"Can't allocate memory to compress data"); if ( (err == Z_OK) && self->zst.avail_out > 0) break;
return NULL;
} /* A nonzero return indicates some sort of error (but see
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length; the comment for the error handler below) */
self->zst.avail_out = length; if ( err != Z_OK ) break;
length = length << 1;
/* There's no space left for output, so increase the buffer and loop
again */
if (_PyString_Resize(&RetVal, length << 1) == -1) {
PyErr_SetString(PyExc_MemoryError,
"Can't allocate memory to compress data");
return NULL;
} }
self->zst.next_out = (unsigned char *)PyString_AsString(RetVal) + length;
self->zst.avail_out = length;
length = length << 1;
} }
if (err != Z_STREAM_END) /* Raise an exception indicating an error. The condition for
detecting a error is kind of complicated; Z_OK indicates no
error, but if the flushmode is Z_FINISH, then Z_STREAM_END is
also not an error. */
if (err!=Z_OK && !(flushmode == Z_FINISH && 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",
@ -566,6 +579,10 @@ PyZlib_flush(self, args)
Py_DECREF(RetVal); Py_DECREF(RetVal);
return NULL; return NULL;
} }
/* If flushmode is Z_FINISH, we also have to call deflateEnd() to
free various data structures */
if (flushmode == Z_FINISH) { if (flushmode == Z_FINISH) {
err=deflateEnd(&(self->zst)); err=deflateEnd(&(self->zst));
if (err!=Z_OK) { if (err!=Z_OK) {