diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-05-08 03:13:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-05-08 03:13:01 (GMT) |
| commit | 5e1038193c820c5a5ae7b27886d8d3100e18ea49 (patch) | |
| tree | 4ea14c9afded968db298090885f66be13ab1c5be /generic/tclIO.c | |
| parent | b622ae7f2419b531a196cd2fe0ac570f195bf030 (diff) | |
| parent | 48ae7e42c1bd6a104c78d737fd6b826a1a4ee7bd (diff) | |
| download | tcl-5e1038193c820c5a5ae7b27886d8d3100e18ea49.zip tcl-5e1038193c820c5a5ae7b27886d8d3100e18ea49.tar.gz tcl-5e1038193c820c5a5ae7b27886d8d3100e18ea49.tar.bz2 | |
Merge 8.5.
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index dd4d489..d69a3d9 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -2612,6 +2612,7 @@ FlushChannel( if (errorCode == EINTR) { errorCode = 0; + ReleaseChannelBuffer(bufPtr); continue; } @@ -2633,6 +2634,7 @@ FlushChannel( UpdateInterest(chanPtr); } errorCode = 0; + ReleaseChannelBuffer(bufPtr); break; } @@ -2694,6 +2696,7 @@ FlushChannel( */ DiscardOutputQueued(statePtr); + ReleaseChannelBuffer(bufPtr); continue; } else { wroteSome = 1; @@ -4031,6 +4034,7 @@ WillRead( { if (chanPtr->typePtr == NULL) { /* Prevent read attempts on a closed channel */ + DiscardInputQueued(chanPtr->state, 0); Tcl_SetErrno(EINVAL); return -1; } @@ -4211,6 +4215,7 @@ Write( if (IsBufferFull(bufPtr)) { if (FlushChannel(NULL, chanPtr, 0) != 0) { + ReleaseChannelBuffer(bufPtr); return -1; } flushed += statePtr->bufSize; |