summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--generic/tclIO.c4
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24f8e34..c057284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2003-03-06 Mo DeJong <mdejong@users.sourceforge.net>
+ * generic/tclIO.c (Tcl_GetsObj): Check that
+ the eol pointer has not gone past the end
+ of the string when in auto translation
+ mode and the INPUT_SAW_CR flag is set.
+ The previous code worked because the
+ end of string value \0 was being compared
+ to \n, this patch just skips that pointless
+ check.
+
+2003-03-06 Mo DeJong <mdejong@users.sourceforge.net>
+
* generic/tclIO.c (WriteBytes, WriteChars,
Tcl_GetsObj, ReadBytes): Rework calls to
TranslateOutputEOL to make it clear that
diff --git a/generic/tclIO.c b/generic/tclIO.c
index f972480..4ffcfb2 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.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: tclIO.c,v 1.63 2003/03/06 09:47:49 mdejong Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.64 2003/03/06 09:58:44 mdejong Exp $
*/
#include "tclInt.h"
@@ -3642,7 +3642,7 @@ Tcl_GetsObj(chan, objPtr)
skip = 1;
if (statePtr->flags & INPUT_SAW_CR) {
statePtr->flags &= ~INPUT_SAW_CR;
- if (*eol == '\n') {
+ if ((eol < dstEnd) && (*eol == '\n')) {
/*
* Skip the raw bytes that make up the '\n'.
*/