summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2016-10-30 08:31:21 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2016-10-30 08:31:21 (GMT)
commit0fd35ed40dcf60d680dd8f063be7f6a66f531e20 (patch)
tree5b90fdc81afcbed854492b6a6a456ede133ab0fe /generic
parent45a4c375a86403b18e66a8401235bf8a3a53f867 (diff)
parentdf54f23b9fdd17bc3eb02a15f3fd9513e6261b7e (diff)
downloadtcl-0fd35ed40dcf60d680dd8f063be7f6a66f531e20.zip
tcl-0fd35ed40dcf60d680dd8f063be7f6a66f531e20.tar.gz
tcl-0fd35ed40dcf60d680dd8f063be7f6a66f531e20.tar.bz2
[1ae12987cb] Ensure that deleting the [history] command deletes its storage.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclZlib.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index fd8b3a1..7f7aff6 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -3177,10 +3177,8 @@ ZlibTransformFlush(
* Get the bytes to go out of the compression engine.
*/
- cd->outStream.next_out = (Bytef *) cd->outBuffer;
- cd->outStream.avail_out = cd->outAllocated;
-
- e = deflate(&cd->outStream, flushType);
+ e = Deflate(&cd->outStream, cd->outBuffer, cd->outAllocated,
+ flushType, &len);
if (e != Z_OK && e != Z_BUF_ERROR) {
ConvertError(interp, e, cd->outStream.adler);
return TCL_ERROR;
@@ -3190,7 +3188,6 @@ ZlibTransformFlush(
* Write the bytes we've received to the next layer.
*/
- len = cd->outStream.next_out - (Bytef *) cd->outBuffer;
if (len > 0 && Tcl_WriteRaw(cd->parent, cd->outBuffer, len) < 0) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"problem flushing channel: %s",