summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclExecute.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 548bec0..86fe926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclExecute.c: Disabled apparently faulty assertion.
+ [Bug 2415422].
+
2008-12-18 Donal K. Fellows <dkf@users.sf.net>
* unix/configure.in, unix/Makefile.in: Autoconf wizardry.
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index ed656d5..c6e0d4f 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -14,7 +14,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.422 2008/12/16 23:24:13 nijtmans Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.423 2008/12/18 23:00:39 dgp Exp $
*/
#include "tclInt.h"
@@ -2044,7 +2044,9 @@ TclExecuteByteCode(
* reset, now process the return.
*/
- NRE_ASSERT(iPtr->cmdFramePtr == bcFramePtr);
+ /* Disabled the following assertion to solve the trouble reported
+ * in Tcl Bug 2415422. Needs review. */
+ /*NRE_ASSERT(iPtr->cmdFramePtr == bcFramePtr);*/
iPtr->cmdFramePtr = bcFramePtr->nextPtr;
if (iPtr->execEnvPtr->rewind) {