diff options
| author | vincentdarley <vincentdarley> | 2002-05-07 18:03:04 (GMT) |
|---|---|---|
| committer | vincentdarley <vincentdarley> | 2002-05-07 18:03:04 (GMT) |
| commit | 6a9dc1249fd050fdbc5fcafe4a1a98330835a7c4 (patch) | |
| tree | 87b40e9954c193d2ece01a0815cb90aeb23226e5 /generic | |
| parent | 10cbc226c1ac7f429fb8a011dd091beee3f3afeb (diff) | |
| download | tcl-6a9dc1249fd050fdbc5fcafe4a1a98330835a7c4.zip tcl-6a9dc1249fd050fdbc5fcafe4a1a98330835a7c4.tar.gz tcl-6a9dc1249fd050fdbc5fcafe4a1a98330835a7c4.tar.bz2 | |
fix to bug 553320
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclFileName.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index b793e38..8fc794b 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclFileName.c,v 1.34 2002/05/02 20:15:20 vincentdarley Exp $ + * RCS: @(#) $Id: tclFileName.c,v 1.35 2002/05/07 18:03:04 vincentdarley Exp $ */ #include "tclInt.h" @@ -1789,18 +1789,25 @@ Tcl_GlobObjCmd(dummy, interp, objc, objv) } } /* - * Error cases + * Error cases. We re-get the interpreter's result, + * just to be sure it hasn't changed, and we reset + * the 'join' flag to zero, since we haven't yet + * made use of it. */ badTypesArg: + resultPtr = Tcl_GetObjResult(interp); Tcl_AppendToObj(resultPtr, "bad argument to \"-types\": ", -1); Tcl_AppendObjToObj(resultPtr, look); result = TCL_ERROR; + join = 0; goto endOfGlob; badMacTypesArg: + resultPtr = Tcl_GetObjResult(interp); Tcl_AppendToObj(resultPtr, "only one MacOS type or creator argument" " to \"-types\" allowed", -1); result = TCL_ERROR; + join = 0; goto endOfGlob; } } |