summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--generic/tclParse.c1
-rw-r--r--tests/parse.test21
3 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9e303a..b85db83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
2013-07-17 Harald Oehlmann <oehhar@users.sf.net>
- * tclUnixNotify.c Tcl_InitNotifier: RFE [a0bc856dcd]
+ * tclUnixNotify.c Tcl_InitNotifier: Bug [a0bc856dcd]
Start notifier thread again if we were forked, to solve Rivet bug
55153.
diff --git a/generic/tclParse.c b/generic/tclParse.c
index 96c2a10..e475fb8 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -1566,6 +1566,7 @@ Tcl_ParseVar(
code = TclSubstTokens(interp, parsePtr->tokenPtr, parsePtr->numTokens,
NULL, 1, NULL, NULL);
+ Tcl_FreeParse(parsePtr);
TclStackFree(interp, parsePtr);
if (code != TCL_OK) {
return NULL;
diff --git a/tests/parse.test b/tests/parse.test
index 4605914..d7de5ff 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -23,6 +23,7 @@ testConstraint testparsevarname [llength [info commands testparsevarname]]
testConstraint testparsevar [llength [info commands testparsevar]]
testConstraint testasync [llength [info commands testasync]]
testConstraint testcmdtrace [llength [info commands testcmdtrace]]
+testConstraint memory [llength [info commands memory]]
test parse-1.1 {Tcl_ParseCommand procedure, computing string length} testparser {
testparser [bytestring "foo\0 bar"] -1
@@ -674,6 +675,26 @@ test parse-13.5 {Tcl_ParseVar procedure, error looking up variable} testparsevar
unset -nocomplain abc
list [catch {testparsevar {$abc([bogus x y z])}} msg] $msg
} {1 {invalid command name "bogus"}}
+test parse-13.6 {Tcl_ParseVar memory leak} -constraints memory -setup {
+ proc getbytes {} {
+ return [lindex [split [memory info] \n] 3 3]
+ }
+} -body {
+ set a() foo
+ set end [getbytes]
+ for {set i 0} {$i < 5} {incr i} {
+ set vn {}
+ set res [testparsevar [append vn $ a([string repeat {[]} 19]) bar]]
+ if {$res ne {foo bar}} {error "Unexpected result: $res"}
+
+ set tmp $end
+ set end [getbytes]
+ }
+ expr {$end - $tmp}
+} -cleanup {
+ unset -nocomplain a end i vn res tmp
+ rename getbytes {}
+} -result 0
test parse-14.1 {Tcl_ParseBraces procedure, computing string length} testparser {
testparser [bytestring "foo\0 bar"] -1