diff options
Diffstat (limited to 'winsup/cygwin/dll_init.cc')
| -rw-r--r-- | winsup/cygwin/dll_init.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc index bd3d7d996..24d6d5c5f 100644 --- a/winsup/cygwin/dll_init.cc +++ b/winsup/cygwin/dll_init.cc @@ -164,7 +164,7 @@ void dll_list::detach (void *retaddr) { dll *d; - if (!myself || exit_state || !(d = find (retaddr))) + if (!myself || !(d = find (retaddr))) return; if (d->count <= 0) system_printf ("WARNING: trying to detach an already detached dll ..."); @@ -172,7 +172,9 @@ dll_list::detach (void *retaddr) { /* Ensure our exception handler is enabled for destructors */ exception protect; - __cxa_finalize (d); + /* Call finalize function if we are not already exiting */ + if (!exit_state) + __cxa_finalize (d); d->run_dtors (); d->prev->next = d->next; if (d->next) |