summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclIO.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35d8214..e645581 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-11-25 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclTest.c: Don't assume that Tcl_SetResult
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 4547a36..b7c7b02 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.148 2008/11/23 18:05:30 ferrieux Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.149 2008/11/25 22:13:34 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -364,8 +364,8 @@ TclFinalizeIOSubsystem(void)
*/
chanPtr->instanceData = NULL;
- SetFlag(statePtr, CHANNEL_DEAD);
}
+ SetFlag(statePtr, CHANNEL_DEAD);
}
}