summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2002-03-27 19:20:54 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2002-03-27 19:20:54 (GMT)
commitc8bf8f196f3a8363d6c1d361328d4874dba95cf2 (patch)
treed91fe7cf72420d2b870c8f0ba8d9ca927de6f51e
parente64c93e702240e727b329082367fb89cbe994591 (diff)
downloadtcl-c8bf8f196f3a8363d6c1d361328d4874dba95cf2.zip
tcl-c8bf8f196f3a8363d6c1d361328d4874dba95cf2.tar.gz
tcl-c8bf8f196f3a8363d6c1d361328d4874dba95cf2.tar.bz2
passing the correct commandSize to TclEvalObjvInternal. [Bug 219362],
fix by David Knoll.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclBasic.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cddbbf7..1ab9c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-03-28 Miguel Sofer <msofer@users.sourceforge.net>
+ * generic/tclBasic.c (Tcl_EvalEx): passing the correct commandSize
+ to TclEvalObjvInternal. [Bug 219362], fix by David Knoll.
+
+2002-03-28 Miguel Sofer <msofer@users.sourceforge.net>
+
* generic/tclBasic.c (Tcl_EvalEx):
* tests/basic.test: avoid exceptional returns at level 0
[Bug 219181]
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 5a4424b..e8372ea 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclBasic.c,v 1.54 2002/03/27 14:35:40 msofer Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.55 2002/03/27 19:20:54 msofer Exp $
*/
#include "tclInt.h"
@@ -3581,7 +3581,8 @@ Tcl_EvalEx(interp, script, numBytes, flags)
code = TCL_ERROR;
} else {
iPtr->numLevels++;
- code = TclEvalObjvInternal(interp, objectsUsed, objv, p, bytesLeft, 0);
+ code = TclEvalObjvInternal(interp, objectsUsed, objv, p,
+ parse.commandStart + parse.commandSize - p, 0);
iPtr->numLevels--;
}
if (code != TCL_OK) {