summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2003-05-12 17:20:39 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2003-05-12 17:20:39 (GMT)
commit8606968d1609c45b49ee63b81ace58a077b6a1ba (patch)
treebe9ea5e0031a738dfb0c79b420fa69d47849b95a /generic
parent99fe4d8e2e7916cd7a6c4c361b6f6d4a92a41e53 (diff)
downloadtcl-8606968d1609c45b49ee63b81ace58a077b6a1ba.zip
tcl-8606968d1609c45b49ee63b81ace58a077b6a1ba.tar.gz
tcl-8606968d1609c45b49ee63b81ace58a077b6a1ba.tar.bz2
* generic/tclVar.c (TclObjLookupVar): [Bug 735335] temporary fix,
disabling usage of tclNsVarNameType. * tests/var.test (var-15.1): test for [Bug 735335]
Diffstat (limited to 'generic')
-rw-r--r--generic/tclVar.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c
index aab35cc..94afe41 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.72 2003/04/28 12:34:31 dkf Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.73 2003/05/12 17:20:41 msofer Exp $
*/
#include "tclInt.h"
@@ -551,6 +551,17 @@ TclObjLookupVar(interp, part1Ptr, part2, flags, msg, createPart1, createPart2,
procPtr->refCount++;
part1Ptr->internalRep.twoPtrValue.ptr1 = (VOID *) procPtr;
part1Ptr->internalRep.twoPtrValue.ptr2 = (VOID *) index;
+#if 0
+ /*
+ * TEMPORARYLY DISABLED tclNsVarNameType
+ *
+ * This is a stop-gap fix for [Bug 735335]; it may not address the
+ * real issue (which I haven't pinned down yet), but it avoids the
+ * segfault in the test case.
+ * This optimisation will hopefully be turned back on soon.
+ * Miguel Sofer, 2003-05-12
+ */
+
} else if (index > -3) {
Namespace *nsPtr;
@@ -559,6 +570,7 @@ TclObjLookupVar(interp, part1Ptr, part2, flags, msg, createPart1, createPart2,
part1Ptr->typePtr = &tclNsVarNameType;
part1Ptr->internalRep.twoPtrValue.ptr1 = (VOID *) nsPtr;
part1Ptr->internalRep.twoPtrValue.ptr2 = (VOID *) varPtr;
+#endif
} else {
/*
* At least mark part1Ptr as already parsed.