diff options
| author | nijtmans <nijtmans> | 2008-10-04 12:54:14 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-10-04 12:54:14 (GMT) |
| commit | e0670e6da0fa957eff9b3e856c65fcd41eb9c711 (patch) | |
| tree | 2b574ad22c7f9498255051014f0597f3078a3820 /generic/tclLoad.c | |
| parent | 0cc58bcc1ebada2169f5e943bd09f446556c7ccf (diff) | |
| download | tcl-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]
Diffstat (limited to 'generic/tclLoad.c')
| -rw-r--r-- | generic/tclLoad.c | 8 |
1 files changed, 5 insertions, 3 deletions
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); } } |