* generic/tclCompCmds.c (TclCompileIfCmd): Corrected string limits of

        arguments interpolated in error messages. [Bug 711371]

2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 76fa70b..69be9bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-04-07  Don Porter  <dgp@users.sourceforge.net>
 
+	* generic/tclCompCmds.c (TclCompileIfCmd):  Corrected string limits of
+	arguments interpolated in error messages. [Bug 711371]
+
 	* generic/tclCmdMZ.c (TraceExecutionProc):  Added missing
 	Tcl_DiscardResult() call to avoid memory leak.
 
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 47b3b1a..ee4e809 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.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: tclCompCmds.c,v 1.45 2003/04/03 16:46:43 dgp Exp $
+ * RCS: @(#) $Id: tclCompCmds.c,v 1.46 2003/04/07 20:00:47 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -1193,8 +1193,8 @@ TclCompileIfCmd(interp, parsePtr, envPtr)
 	}
 	if (wordIdx >= numWords) {
 	    sprintf(buffer,
-	            "wrong # args: no expression after \"%.30s\" argument",
-		    word);
+	            "wrong # args: no expression after \"%.*s\" argument",
+		    numBytes, word);
 	    Tcl_ResetResult(interp);
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp), buffer, -1);
 	    code = TCL_ERROR;
@@ -1256,7 +1256,7 @@ TclCompileIfCmd(interp, parsePtr, envPtr)
 	tokenPtr = testTokenPtr + (testTokenPtr->numComponents + 1);
 	wordIdx++;
 	if (wordIdx >= numWords) {
-	    sprintf(buffer, "wrong # args: no script following \"%.20s\" argument", testTokenPtr->start);
+	    sprintf(buffer, "wrong # args: no script following \"%.*s\" argument", testTokenPtr->size, testTokenPtr->start);
 	    Tcl_ResetResult(interp);
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp), buffer, -1);
 	    code = TCL_ERROR;