summaryrefslogtreecommitdiffstats
path: root/generic/tclIO.c
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-08-02 12:08:37 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-08-02 12:08:37 (GMT)
commit9d0b03b064d691de9202a0f56b437c2a7358bb48 (patch)
tree77b059089eb70cf671ae3bf5930fda9cf184e04b /generic/tclIO.c
parent657909a7dac6877f33f9e95daaea54ba4c563411 (diff)
parentb20744743c4ae4d1e771087f9a630d1f3f0b82e8 (diff)
downloadtcl-9d0b03b064d691de9202a0f56b437c2a7358bb48.zip
tcl-9d0b03b064d691de9202a0f56b437c2a7358bb48.tar.gz
tcl-9d0b03b064d691de9202a0f56b437c2a7358bb48.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r--generic/tclIO.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index ea6c2d7..2de8b53 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -427,7 +427,10 @@ TclFinalizeIOSubsystem(void)
statePtr != NULL;
statePtr = statePtr->nextCSPtr) {
chanPtr = statePtr->topChanPtr;
- if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED | CHANNEL_DEAD)
+ if (GotFlag(statePtr, CHANNEL_DEAD)) {
+ continue;
+ }
+ if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED )
|| GotFlag(statePtr, BG_FLUSH_SCHEDULED)) {
ResetFlag(statePtr, BG_FLUSH_SCHEDULED);
active = 1;
@@ -8822,6 +8825,7 @@ TclChannelEventScriptInvoker(
*/
Tcl_Preserve(interp);
+ Tcl_Preserve(chanPtr);
result = Tcl_EvalObjEx(interp, esPtr->scriptPtr, TCL_EVAL_GLOBAL);
/*
@@ -8838,6 +8842,7 @@ TclChannelEventScriptInvoker(
}
Tcl_BackgroundException(interp, result);
}
+ Tcl_Release(chanPtr);
Tcl_Release(interp);
}