diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-05-04 19:19:46 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-05-04 19:19:46 +0000 |
| commit | 975757698f521dffeb360ced0a5540a922856500 (patch) | |
| tree | d056b6b1ced61f8d9ed549b3693f0a5c4d58ee30 | |
| parent | 3521d504804b8c43c93ade54c67716308c0c7d03 (diff) | |
| download | cygnal-975757698f521dffeb360ced0a5540a922856500.tar.gz cygnal-975757698f521dffeb360ced0a5540a922856500.tar.bz2 cygnal-975757698f521dffeb360ced0a5540a922856500.zip | |
* dll_list::detach (dll_list::detach): Avoid doing anything with detach during
a failing fork.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/dll_init.cc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2919c99b2..243358a84 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2011-05-04 Christopher Faylor <me.cygwin2011@cgf.cx> + * dll_list::detach (dll_list::detach): Avoid doing anything with detach + during a failing fork. + +2011-05-04 Christopher Faylor <me.cygwin2011@cgf.cx> + * dll_init.cc (dll_global_dtors): Avoid calling destructors during failing fork(). diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc index 99974944b..1b6072a47 100644 --- a/winsup/cygwin/dll_init.cc +++ b/winsup/cygwin/dll_init.cc @@ -181,7 +181,10 @@ void dll_list::detach (void *retaddr) { dll *d; - if (!myself) + /* Don't attempt to call destructors if we're still in fork processing + since that likely means fork is failing and everything will not have been + set up. */ + if (!myself || in_forkee) return; guard (true); if ((d = find (retaddr))) |