summaryrefslogtreecommitdiffstats
path: root/generic/tclUtil.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-07-16 21:25:07 (GMT)
committerhobbs <hobbs>2003-07-16 21:25:07 (GMT)
commit1eed55791b810c759765f088dc6b8d9f4477564c (patch)
tree7420a60f355dca8b31bfe9fec2dc4a6bb9cf47be /generic/tclUtil.c
parent181345ef815f579dbd068f54942e8656d8dca9b0 (diff)
downloadtcl-1eed55791b810c759765f088dc6b8d9f4477564c.zip
tcl-1eed55791b810c759765f088dc6b8d9f4477564c.tar.gz
tcl-1eed55791b810c759765f088dc6b8d9f4477564c.tar.bz2
* generic/tclPreserve.c: In Result and Preserve'd routines, do not
* generic/tclUtil.c: assume that ckfree == free, as that is not * generic/tclResult.c: always true. [Bug 756791] (fuller)
Diffstat (limited to 'generic/tclUtil.c')
-rw-r--r--generic/tclUtil.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 2572891..cb15ffd 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUtil.c,v 1.36.2.1 2003/04/16 23:31:46 dgp Exp $
+ * RCS: @(#) $Id: tclUtil.c,v 1.36.2.2 2003/07/16 21:25:07 hobbs Exp $
*/
#include "tclInt.h"
@@ -1744,8 +1744,7 @@ Tcl_DStringGetResult(interp, dsPtr)
dsPtr->length = strlen(iPtr->result);
if (iPtr->freeProc != NULL) {
- if ((iPtr->freeProc == TCL_DYNAMIC)
- || (iPtr->freeProc == (Tcl_FreeProc *) free)) {
+ if (iPtr->freeProc == TCL_DYNAMIC) {
dsPtr->string = iPtr->result;
dsPtr->spaceAvl = dsPtr->length+1;
} else {