From 4f590a234bdd3971a2afe40a4640caedbcbb4408 Mon Sep 17 00:00:00 2001
From: davygrvy <davygrvy@pobox.com>
Date: Thu, 6 May 2004 01:02:18 +0000
Subject: * generic/tclEvent.c: TclSetLibraryPath's use of caching the
 stringrep of the pathPtr object to TclGetLibraryPath called from another
 thread was ineffective if the original's stringrep had been invalidated as
 what happens when it gets muted to a list.

* generic/tclInt.h:
* generic/tclThread.c:
* generic/tclEvent.c:
* unix/tclUnixThrd.c:
* win/tclWinThrd.c:  Provisions made so masterLock, initLock,
allocLock and joinLock mutexes can be recovered during
Tcl_Finalize.
---
 generic/tclEvent.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 305a1e4..fb40447 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclEvent.c,v 1.28.2.1 2003/05/13 12:44:07 dkf Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.28.2.2 2004/05/06 01:02:18 davygrvy Exp $
  */
 
 #include "tclInt.h"
@@ -100,8 +100,9 @@ static Tcl_ThreadDataKey dataKey;
 
 /*
  * Common string for the library path for sharing across threads.
+ * This is ckalloc'd and cleared in Tcl_Finalize.
  */
-char *tclLibraryPathStr;
+static char *tclLibraryPathStr = NULL;
 
 /*
  * Prototypes for procedures referenced only in this file:
@@ -593,6 +594,8 @@ TclSetLibraryPath(pathPtr)
 				 * the new library path. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    const char *toDupe;
+    int size;
 
     if (pathPtr != NULL) {
 	Tcl_IncrRefCount(pathPtr);
@@ -606,7 +609,12 @@ TclSetLibraryPath(pathPtr)
      *  No mutex locking is needed here as up the stack we're within
      *  TclpInitLock().
      */
-    tclLibraryPathStr = Tcl_GetStringFromObj(pathPtr, NULL);
+    if (tclLibraryPathStr != NULL) {
+	ckfree(tclLibraryPathStr);
+    }
+    toDupe = Tcl_GetStringFromObj(pathPtr, &size);
+    tclLibraryPathStr = ckalloc(size+1);
+    strcpy(tclLibraryPathStr, toDupe);
 }
 
 /*
@@ -842,6 +850,10 @@ Tcl_Finalize()
 	    ckfree(tclDefaultEncodingDir);
 	    tclDefaultEncodingDir = NULL;
 	}
+	if (tclLibraryPathStr != NULL) {
+	    ckfree(tclLibraryPathStr);
+	    tclLibraryPathStr = NULL;
+	}
 	
 	Tcl_SetPanicProc(NULL);
 
@@ -877,7 +889,7 @@ Tcl_Finalize()
 	TclFinalizeMemorySubsystem();
 	inFinalize = 0;
     }
-    TclpInitUnlock();
+    TclFinalizeLock();
 }
 
 /*
-- 
cgit v0.12