From b6d046213b7d8a18051b7b0992c6bc1516e4ed2a Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 2 Oct 2014 17:43:16 +0000
Subject: [bc1a96407a] Partial solution should avoid crash, but may lead to
 wrong behavior.

---
 generic/tclTrace.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index c0cde49..2a348e6 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -2511,7 +2511,11 @@ TclObjCallVarTraces(
     if (!part1Ptr) {
 	part1Ptr = localName(iPtr->varFramePtr, index);
     }
-    part1 = TclGetString(part1Ptr);
+    if (part1Ptr) {
+	part1 = TclGetString(part1Ptr);
+    } else {
+	part1 = tclEmptyString;
+    }
     part2 = part2Ptr? TclGetString(part2Ptr) : NULL;
 
     return TclCallVarTraces(iPtr, arrayPtr, varPtr, part1, part2, flags,
-- 
cgit v0.12


From 5190862515e3cf2477b403402c70b1c25db282fa Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 2 Oct 2014 21:40:13 +0000
Subject: Possible fix for testing.

---
 generic/tclCompCmds.c | 8 +++++---
 generic/tclTrace.c    | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 496d44f..18f4564 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -301,7 +301,8 @@ TclCompileArraySetCmd(
      * a proc, we cannot do a better compile than generic.
      */
 
-    if (envPtr->procPtr == NULL && !(isDataEven && len == 0)) {
+    if ((varTokenPtr->type != TCL_TOKEN_SIMPLE_WORD) ||
+	    (envPtr->procPtr == NULL && !(isDataEven && len == 0))) {
 	code = TclCompileBasic2ArgCmd(interp, parsePtr, cmdPtr, envPtr);
 	goto done;
     }
@@ -342,8 +343,9 @@ TclCompileArraySetCmd(
 	 * a non-local variable: upvar from a local one! This consumes the
 	 * variable name that was left at stacktop.
 	 */
-	
-	localIndex = AnonymousLocal(envPtr);
+
+	localIndex = TclFindCompiledLocal(varTokenPtr->start,
+		varTokenPtr->size, 1, envPtr);
 	PushStringLiteral(envPtr, "0");
 	TclEmitInstInt4(INST_REVERSE, 2,        		envPtr);
 	TclEmitInstInt4(INST_UPVAR, localIndex, 		envPtr);
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 2a348e6..6184a89 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -2511,11 +2511,10 @@ TclObjCallVarTraces(
     if (!part1Ptr) {
 	part1Ptr = localName(iPtr->varFramePtr, index);
     }
-    if (part1Ptr) {
-	part1 = TclGetString(part1Ptr);
-    } else {
-	part1 = tclEmptyString;
+    if (!part1Ptr) {
+	Tcl_Panic("Cannot trace a variable with no name");
     }
+    part1 = TclGetString(part1Ptr);
     part2 = part2Ptr? TclGetString(part2Ptr) : NULL;
 
     return TclCallVarTraces(iPtr, arrayPtr, varPtr, part1, part2, flags,
-- 
cgit v0.12


From ae02ceb3de605244211918465b4e4662fe14bc98 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 3 Oct 2014 15:47:38 +0000
Subject: test cases

---
 tests/var.test | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/var.test b/tests/var.test
index 8e862f7..a7950be 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -865,6 +865,17 @@ test var-20.8 {array set compilation correctness: Bug 3603163} -setup {
     }}
     array size x
 } -result 0
+test var-20.9 {[bc1a96407a] array set compiled w/ trace} {
+    variable foo
+    lappend lambda {}
+    lappend lambda [list array set [namespace which -variable foo] {a 1}]
+    after 0 [list apply $lambda]
+    vwait [namespace which -variable foo]
+    unset -nocomplain lambda foo
+} {}
+test var-20.10 {[bc1a96407a] array set don't compile bad varname} -body {
+    apply {{} {set name foo(bar); array set $name {a 1}}}
+} -returnCodes error -match glob -result *
 
 test var-21.0 {PushVarNameWord OBOE in compiled unset} -setup {
     proc linenumber {} {dict get [info frame -1] line}
-- 
cgit v0.12