diff options
| author | andreask@activestate.com <andreas_kupries> | 2001-12-12 22:32:35 (GMT) |
|---|---|---|
| committer | andreask@activestate.com <andreas_kupries> | 2001-12-12 22:32:35 (GMT) |
| commit | 0ddada18e54b73fa4aaeecd8bf1bd5ba7ea78542 (patch) | |
| tree | cde1cbddbda471b364cd31936971af45b230c077 /generic/tclIO.c | |
| parent | c04b0344c4db05461a262db72406785aec78faf6 (diff) | |
| download | tcl-0ddada18e54b73fa4aaeecd8bf1bd5ba7ea78542.zip tcl-0ddada18e54b73fa4aaeecd8bf1bd5ba7ea78542.tar.gz tcl-0ddada18e54b73fa4aaeecd8bf1bd5ba7ea78542.tar.bz2 | |
* generic/tclIO.c (Tcl_GetsObj): Applied patch for bug #491341 as
provided by Don Porter <dgp@users.sourceforge.net>. Fixes
assumption of having an empty Tcl_Obj to work with.
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 982d6ff..22f22bc 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.41 2001/11/07 04:47:54 andreas_kupries Exp $ + * RCS: @(#) $Id: tclIO.c,v 1.42 2001/12/12 22:32:35 andreas_kupries Exp $ */ #include "tclInt.h" @@ -3631,13 +3631,13 @@ Tcl_GetsObj(chan, objPtr) if (statePtr->flags & CHANNEL_EOF) { skip = 0; eol = dstEnd; - if (eol == objPtr->bytes) { + if (eol == objPtr->bytes + oldLength) { /* - * If we didn't produce any bytes before encountering EOF, + * If we didn't append any bytes before encountering EOF, * caller needs to see -1. */ - Tcl_SetObjLength(objPtr, 0); + Tcl_SetObjLength(objPtr, oldLength); CommonGetsCleanup(chanPtr, encoding); copiedTotal = -1; goto done; |