Tcl Source Code

Artifact [44a11ad131]
Login

Artifact 44a11ad131bff7e051579ed9b13301bb799c22b0:

Attachment "553320.patch" to ticket [553320ffff] added by msofer 2002-05-08 00:57:16.
Index: generic/tclFileName.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclFileName.c,v
retrieving revision 1.34
diff -u -r1.34 tclFileName.c
--- generic/tclFileName.c	2 May 2002 20:15:20 -0000	1.34
+++ generic/tclFileName.c	7 May 2002 17:53:38 -0000
@@ -1788,19 +1788,27 @@
 			}
 		    }
 		}
-		/*
-		 * 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;
 	    }
 	}