summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-11-25 22:16:03 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-11-25 22:16:03 (GMT)
commit4f1e14923d50353097e8f629a8138d1acb8e64a1 (patch)
tree712cff4d4446880f5e07cdcd184537886fab0a54
parent7aaca6e2af565920f71bb68dbd2182b4ca82ed90 (diff)
downloadtcl-4f1e14923d50353097e8f629a8138d1acb8e64a1.zip
tcl-4f1e14923d50353097e8f629a8138d1acb8e64a1.tar.gz
tcl-4f1e14923d50353097e8f629a8138d1acb8e64a1.tar.bz2
* generic/tclIO.c (TclFinalizeIOSubsystem): Applied Alexandre
Ferrieux's patch for [Bug 2270477] to prevent infinite looping during finalization of channels not bound to interpreters.
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclIO.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3acfaed..80b6cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25 Andreas Kupries <andreask@activestate.com>
+
+ * generic/tclIO.c (TclFinalizeIOSubsystem): Applied Alexandre
+ Ferrieux's patch for [Bug 2270477] to prevent infinite looping
+ during finalization of channels not bound to interpreters.
+
2008-08-23 Andreas Kupries <andreask@activestate.com>
* generic/tclIO.c: Backport of fix for [Bug 2333466].
diff --git a/generic/tclIO.c b/generic/tclIO.c
index d1c7b6b..96659e8 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.137.2.7 2008/11/23 19:29:19 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.137.2.8 2008/11/25 22:16:03 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -364,8 +364,8 @@ TclFinalizeIOSubsystem(void)
*/
chanPtr->instanceData = NULL;
- SetFlag(statePtr, CHANNEL_DEAD);
}
+ SetFlag(statePtr, CHANNEL_DEAD);
}
}