summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-09-04 21:07:18 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-09-04 21:07:18 (GMT)
commit8b0b3531f3dd05e5a4fd6a5d144f83c7e6b28b07 (patch)
tree1a8215a6d786043f87510b029dec35af6a29cac2 /generic
parentec6f24d1c6194c2ea9a6a128f03ec6ef8c5e3e3b (diff)
downloadtcl-8b0b3531f3dd05e5a4fd6a5d144f83c7e6b28b07.zip
tcl-8b0b3531f3dd05e5a4fd6a5d144f83c7e6b28b07.tar.gz
tcl-8b0b3531f3dd05e5a4fd6a5d144f83c7e6b28b07.tar.bz2
Patched up flaw in option syntax checking
Diffstat (limited to 'generic')
-rw-r--r--generic/tclCompCmds.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index ffcd22a..c9b60dc 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.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: tclCompCmds.c,v 1.154 2009/09/04 17:33:11 dgp Exp $
+ * RCS: @(#) $Id: tclCompCmds.c,v 1.155 2009/09/04 21:07:18 dgp Exp $
*/
#include "tclInt.h"
@@ -3877,7 +3877,7 @@ TclCompileSubstCmd(
Tcl_Parse parse;
Tcl_InterpState state = NULL;
Tcl_Token *wordTokenPtr = TokenAfter(parsePtr->tokenPtr);
- int breakOffset = 0, count = 0, code = TCL_OK;
+ int breakOffset = 0, count = 0, code = TCL_ERROR;
Tcl_Token *endTokenPtr, *tokenPtr;
DefineLineInformation; /* TIP #280 */
int bline = mapPtr->loc[eclIndex].line[numArgs];
@@ -3912,10 +3912,7 @@ TclCompileSubstCmd(
* parts of the compile machinery get upset. They want all pointers
* stored in Tcl_Tokens to point back to the same original string.
*/
- if (wordTokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
- code = TCL_ERROR;
- }
- if (code == TCL_OK) {
+ if (wordTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
code = TclSubstOptions(NULL, numOpts, objv, &flags);
}