Added new fix for the Tcl Bug #770053. Now we conditionaly perform

the TclFinalizeNotifier in order to correct broken ref-counting
of the notifier thread.

1 files changed, 14 insertions, 2 deletions

diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index 39a1cac..3f62d1a 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclNotify.c,v 1.14 2004/04/06 22:25:54 dgp Exp $
+ * RCS: @(#) $Id: tclNotify.c,v 1.15 2004/07/15 21:17:03 vasiljevic Exp $
  */
 
 #include "tclInt.h"
@@ -136,7 +136,15 @@ TclInitNotifier()
  *
  * Side effects:
  *	Removes the notifier associated with the current thread from
- *	the global notifier list.
+ *	the global notifier list. This is done only if the notifier
+ *	was initialized for this thread by call to TclInitNotifier().
+ *	This is always true for threads which have been seeded with
+ * 	an Tcl interpreter, since the call to Tcl_CreateInterp will,
+ * 	among other things, call TclInitializeSubsystems() and this
+ *	one will, in turn, call the TclInitNotifier() for the thread.
+ *	For threads created without the Tcl interpreter, though,
+ *	nobody is explicitly nor implicitly calling the TclInitNotifier 
+ *	hence, TclFinalizeNotifier should not be performed at all.
  *
  *----------------------------------------------------------------------
  */
@@ -148,6 +156,10 @@ TclFinalizeNotifier()
     ThreadSpecificData **prevPtrPtr;
     Tcl_Event *evPtr, *hold;
 
+    if (tsdPtr->threadId == (Tcl_ThreadId)0) {
+        return; /* Notifier not initialized for the current thread */
+    }
+
     Tcl_MutexLock(&(tsdPtr->queueMutex));
     for (evPtr = tsdPtr->firstEventPtr; evPtr != (Tcl_Event *) NULL; ) {
 	hold = evPtr;