summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2010-07-31 20:28:02 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2010-07-31 20:28:02 (GMT)
commit2c99a69cafec5cc9658b02d3c5e3ac8a56358744 (patch)
tree25547d8f3b4bdefbce76290fc0349e3087a6496e
parentbfac0d889b3c93d842e33ec66f1f0ef384da3de7 (diff)
downloadtcl-2c99a69cafec5cc9658b02d3c5e3ac8a56358744.zip
tcl-2c99a69cafec5cc9658b02d3c5e3ac8a56358744.tar.gz
tcl-2c99a69cafec5cc9658b02d3c5e3ac8a56358744.tar.bz2
* generic/tclVar.c: fix for crash [Bug 3037525]: lose fickle
optimisation in TclDeleteVars (used for runtime-created locals)
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclVar.c9
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 50d1473..d7f056d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-28 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclVar.c: fix for crash [Bug 3037525]: lose fickle
+ optimisation in TclDeleteVars (used for runtime-created locals)
+
2010-07-29 Jan Nijtmans <nijtmans@users.sf.net>
* compat/zlib/win32/README.txt Official build of zlib1.dll 1.2.5 is
diff --git a/generic/tclVar.c b/generic/tclVar.c
index c07cc6f..7587eec 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -16,7 +16,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclVar.c,v 1.199 2010/05/31 08:54:14 nijtmans Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.200 2010/07/31 20:28:04 msofer Exp $
*/
#include "tclInt.h"
@@ -5330,14 +5330,9 @@ TclDeleteVars(
for (varPtr = VarHashFirstVar(tablePtr, &search); varPtr != NULL;
varPtr = VarHashNextVar(&search)) {
- /*
- * Lie about the validity of the hashtable entry. In this way the
- * variables will be deleted by VarHashDeleteTable.
- */
-
- VarHashInvalidateEntry(varPtr);
UnsetVarStruct(varPtr, NULL, iPtr, VarHashGetKey(varPtr), NULL, flags,
-1);
+ VarHashDeleteEntry(varPtr);
}
VarHashDeleteTable(tablePtr);
}