summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCompile.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 363e1a1..d83e595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-21 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclCompile.c: Correct botch in the conversion of
+ Tcl_SubstObj(). Thanks to Kevin Kenny for detection and report.
+
2009-09-17 Don Porter <dgp@users.sourceforge.net>
* generic/tclCompile.c: Re-implement Tcl_SubstObj() as a simple
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 36e24d2..7104f94 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompile.c,v 1.176 2009/09/17 17:58:10 dgp Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.177 2009/09/21 16:16:05 dgp Exp $
*/
#include "tclInt.h"
@@ -896,8 +896,10 @@ Tcl_SubstObj(
Tcl_Obj *objPtr, /* The value to be substituted. */
int flags) /* What substitutions to do. */
{
+ TEOV_callback *rootPtr = TOP_CB(interp);
+
if (TclNRRunCallbacks(interp, TclNRSubstObj(interp, objPtr, flags),
- TOP_CB(interp), 0) != TCL_OK) {
+ rootPtr, 0) != TCL_OK) {
return NULL;
}
return Tcl_GetObjResult(interp);