From 071c731c5e45080a89c03c7ae74ec6acf4df59c2 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 19 Sep 2013 14:06:46 +0000
Subject: Stop segfault due to OBOE in CompileWord() calls in [dict incr]
 compiler.

---
 generic/tclCompCmds.c | 2 +-
 tests/dict.test       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 260bd28..3445c09 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -806,7 +806,7 @@ TclCompileDictIncrCmd(
      * Emit the key and the code to actually do the increment.
      */
 
-    CompileWord(envPtr, keyTokenPtr, interp, 3);
+    CompileWord(envPtr, keyTokenPtr, interp, 2);
     TclEmitInstInt4( INST_DICT_INCR_IMM, incrAmount,	envPtr);
     TclEmitInt4(     dictVarIndex,			envPtr);
     return TCL_OK;
diff --git a/tests/dict.test b/tests/dict.test
index 83f1ca7..fec000d 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -1254,6 +1254,11 @@ test dict-23.4 {CompileWord OBOE} {
 	} [return [incr n -[linenumber]]] val
     }} [linenumber]
 } 1
+test dict-23.5 {CompileWord OBOE} {
+    # segfault when buggy
+    apply {{} {tcl::dict::incr foo \
+	[format bar]}}
+} {bar 1}
 
 rename linenumber {}
 
-- 
cgit v0.12