summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclExecute.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9701ae6..d9347d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-19 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclExecute.c (INST_DICT_APPEND, INST_DICT_LAPPEND):
+ fixed faulty peephole optimisation that can cause crashes
+ [Bug 1331475]
+
2005-10-18 Don Porter <dgp@users.sourceforge.net>
* generic/tclExecute.c: Added optimization for I32L64 systems to
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 6663dfd..3f1971f 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.215 2005/10/18 13:19:12 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.216 2005/10/19 13:15:14 msofer Exp $
*/
#include "tclInt.h"
@@ -5882,7 +5882,7 @@ TclExecuteByteCode(interp, codePtr)
}
}
#ifndef TCL_COMPILE_DEBUG
- if (*(pc+9) == INST_POP) {
+ if (*(pc+5) == INST_POP) {
NEXT_INST_F(6, 2, 0);
}
#endif