summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2011-08-05 00:00:15 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2011-08-05 00:00:15 (GMT)
commitc6ae1163ac5b975510aad910b2693c58accdac96 (patch)
treed7f4a5cbd6bb2fc45a9d2506c6bd18c3a3bbd2a0
parentac6a1491aaf30ac441a0c7bbd5963c3188b722e6 (diff)
downloadtcl-c6ae1163ac5b975510aad910b2693c58accdac96.zip
tcl-c6ae1163ac5b975510aad910b2693c58accdac96.tar.gz
tcl-c6ae1163ac5b975510aad910b2693c58accdac96.tar.bz2
[Bug 3386197]: Fix buffer direction botch. Damn you, confusing terminology!
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclZlib.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 61825c0..9d2b16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
2011-08-05 Donal K. Fellows <dkf@users.sf.net>
* generic/tclZlib.c (ZlibTransformClose): [Bug 3386197]: Plug a memory
- leak found by Miguel with valgrind.
+ leak found by Miguel with valgrind, and ensure that the correct
+ direction's buffers are released.
2011-08-04 Miguel Sofer <msofer@users.sf.net>
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 80431a3..922ec18 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -2295,9 +2295,9 @@ ZlibTransformClose(
}
}
} while (e != Z_STREAM_END);
- e = deflateEnd(&cd->inStream);
+ e = deflateEnd(&cd->outStream);
} else {
- e = inflateEnd(&cd->outStream);
+ e = inflateEnd(&cd->inStream);
}
/*