summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/tclVar.c11
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ea73038..f09f8a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-28 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclVar.c (UnsetVarStruct): fix possible segfault.
+
2007-06-27 Don Porter <dgp@users.sourceforge.net>
* generic/tclTrace.c: Corrected broken trace reversal logic in
diff --git a/generic/tclVar.c b/generic/tclVar.c
index a0d4ca6..2492eca 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -15,7 +15,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.135.2.4 2007/06/27 01:37:44 dgp Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.135.2.5 2007/06/28 18:09:20 dgp Exp $
*/
#include "tclInt.h"
@@ -2140,6 +2140,7 @@ UnsetVarStruct(
}
if (part1Ptr) {
Tcl_DecrRefCount(part1Ptr);
+ part1 = NULL;
}
}
@@ -2171,10 +2172,10 @@ UnsetVarStruct(
} else if (TclIsVarArray(dummyVarPtr) && !TclIsVarUndefined(dummyVarPtr)) {
/*
* If the variable is an array, delete all of its elements. This must
- * be done after calling the traces on the array, above (that's the
- * way traces are defined). If the array is traced, its name is
- * already in part1. If not, and the name is required for some
- * element, it will be computed at DeleteArray.
+ * be done after calling and deleting the traces on the array, above
+ * (that's the way traces are defined). If the array name is not
+ * present and is required for a trace on some element, it will be
+ * computed at DeleteArray.
*/
DeleteArray(iPtr, part1, dummyVarPtr, (flags