summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclIOCmd.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 98d54b5..00a1904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-15 Andreas Kupries <andreask@pliers.activestate.com>
+
+ * generic/tclIOCmd.c (Tcl_PutsObjCmd): Added length check to the
+ old depreceated newline syntax, to ensure that only "nonewline"
+ is accepted. [Tcl SF Bug 985869], reported by Joe Mistachkin
+ <mistachkin@users.sourceforge.net>.
+
2004-07-15 Kevin Kenny <kennykb@acm.org>
* generic/tclEvent.c (Tcl_Finalize): stuffed memory leak
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 1f7cd44..551a41b 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOCmd.c,v 1.18 2004/04/06 22:25:52 dgp Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.19 2004/07/15 20:19:30 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -101,7 +101,7 @@ Tcl_PutsObjCmd(dummy, interp, objc, objv)
int length;
arg = Tcl_GetStringFromObj(objv[3], &length);
- if (strncmp(arg, "nonewline", (size_t) length) != 0) {
+ if ((length != 9) || (strncmp(arg, "nonewline", (size_t) length) != 0)) {
Tcl_AppendResult(interp, "bad argument \"", arg,
"\": should be \"nonewline\"",
(char *) NULL);