summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclIO.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 195bdf8..4803a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-25 Andreas Kupries <andreask@activestate.com>
+
+ * generic/tclIO.c (TclFinalizeIOSubsystem): Applied backport of
+ 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 b145d0f..8b7dd2f 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.61.2.30 2008/11/23 19:26:09 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.61.2.31 2008/11/25 22:18:16 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -302,8 +302,8 @@ TclFinalizeIOSubsystem(void)
*/
chanPtr->instanceData = NULL;
- statePtr->flags |= CHANNEL_DEAD;
}
+ statePtr->flags |= CHANNEL_DEAD;
}
}