summaryrefslogtreecommitdiffstats
path: root/generic/tclZlib.c
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2017-03-06 20:19:39 (GMT)
committersebres <sebres@users.sourceforge.net>2017-03-06 20:19:39 (GMT)
commita307956de52eb22f4299959a93df2172b8a40b23 (patch)
treee533d7a219281f35c1f76db707b49db9f39a6946 /generic/tclZlib.c
parentd5c91a755cafe40630668464ed4e070fdd647852 (diff)
parentae0c48521551ffe6af28967e0c3b848836fb632e (diff)
downloadtcl-a307956de52eb22f4299959a93df2172b8a40b23.zip
tcl-a307956de52eb22f4299959a93df2172b8a40b23.tar.gz
tcl-a307956de52eb22f4299959a93df2172b8a40b23.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclZlib.c')
-rw-r--r--generic/tclZlib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index c231f44..96b8318 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1204,10 +1204,10 @@ Tcl_ZlibStreamPut(
zshPtr->stream.avail_in = size;
/*
- * Must not do a zero-length compress. [Bug 25842c161]
+ * Must not do a zero-length compress unless finalizing. [Bug 25842c161]
*/
- if (size == 0) {
+ if (size == 0 && flush != Z_FINISH) {
return TCL_OK;
}