summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-10-04 12:54:14 (GMT)
committernijtmans <nijtmans>2008-10-04 12:54:14 (GMT)
commite0670e6da0fa957eff9b3e856c65fcd41eb9c711 (patch)
tree2b574ad22c7f9498255051014f0597f3078a3820
parent0cc58bcc1ebada2169f5e943bd09f446556c7ccf (diff)
downloadtcl-e0670e6da0fa957eff9b3e856c65fcd41eb9c711.zip
tcl-e0670e6da0fa957eff9b3e856c65fcd41eb9c711.tar.gz
tcl-e0670e6da0fa957eff9b3e856c65fcd41eb9c711.tar.bz2
* generic/tclLoad.c: Make sure that any library which
doesn't have an unloadproc is only really unloaded when no library code is executed yet. [Bug 2059262]
-rw-r--r--ChangeLog31
-rw-r--r--generic/tclLoad.c8
2 files changed, 36 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e772f7..8e47439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-04 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclLoad.c: Make sure that any library which
+ doesn't have an unloadproc is only really unloaded when
+ no library code is executed yet. [Bug 2059262]
+
2008-10-04 Donal K. Fellows <dkf@users.sf.net>
* generic/tclOOInfo.c (GetClassFromObj): Factor out the code to parse
@@ -8,6 +14,18 @@
2008-10-04 Jan Nijtmans <nijtmans@users.sf.net>
+ * doc/ChnlStack.3: CONSTified the typePtr argument
+ * doc/CrtChannel.3: of Tcl_CreateChannel and Tcl_StackChannel
+ * generic/tcl.decls and the return value of Tcl_GetChannelType
+ * generic/tcl.h
+ * generic/tclIO.h
+ * generic/tclIO.c
+ * ChangeLog
+ * generic/tclDecls.h: regenerated
+ This change complies with TIP #27.
+
+2008-10-4 Jan Nijtmans <nijtmans@users.sf.net>
+
* doc/Hash.3: CONSTified the typePtr argument
* generic/tcl.decls: of Tcl_InitCustomHashTable.
* generic/tcl.h
@@ -16,6 +34,19 @@
* generic/tclDecls.h: regenerated
This change complies with TIP #27.
+2008-10-4 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * doc/RegConfig.3: CONSTified the configuration argument
+ * generic/tcl.decls: of Tcl_RegisterConfig.
+ * generic/tcl.h
+ * generic/tclConfig.c
+ * generic/tclPkgConfig.c
+ * ChangeLog
+ * generic/tclDecls.h: regenerated
+ This change complies with TIP #27.
+
+2008-10-4 Jan Nijtmans <nijtmans@users.sf.net>
+
* doc/GetIndex.3: CONSTified the tablePtr argument
* generic/tcl.decls: of Tcl_GetIndexFromObj.
* generic/tclIndexObj.c
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 6c1c483..479c1fb 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoad.c,v 1.18 2008/07/21 21:25:21 nijtmans Exp $
+ * RCS: @(#) $Id: tclLoad.c,v 1.19 2008/10/04 12:54:14 nijtmans Exp $
*/
#include "tclInt.h"
@@ -791,7 +791,9 @@ Tcl_UnloadObjCmd(
if (unLoadProcPtr != NULL) {
Tcl_MutexLock(&packageMutex);
- unLoadProcPtr(pkgPtr->loadHandle);
+ if (pkgPtr->unloadProc != NULL) {
+ unLoadProcPtr(pkgPtr->loadHandle);
+ }
/*
* Remove this library from the loaded library cache.
@@ -1144,7 +1146,7 @@ TclFinalizeLoad(void)
*/
if (pkgPtr->fileName[0] != '\0') {
- if (pkgPtr->unLoadProcPtr != NULL) {
+ if ((pkgPtr->unLoadProcPtr != NULL) && (pkgPtr->unloadProc != NULL)) {
pkgPtr->unLoadProcPtr(pkgPtr->loadHandle);
}
}