* cygtls.cc (_cygtls::remove): Don't bother if we're exiting.

* sigproc.cc (_cygtls::remove_wq): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aae9a4a9f5f3dbc22b1b207459508d1f21a06d2a..f4aa368fd6c194e485b8a4907280a5f05e0cffb3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-13  Christopher Faylor  <cgf@timesys.com>
+
+       * cygtls.cc (_cygtls::remove): Don't bother if we're exiting.
+       * sigproc.cc (_cygtls::remove_wq): Ditto.
+
 2005-12-13  Christopher Faylor  <cgf@timesys.com>
 
        * fhandler_tty.cc (fhandler_tty::open): Enhance comment.

diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index 568c5af234ce8580d507c6afee8d5b41f62e0f68..e8e846e54d6014c08b260cf1a97cb867b0bf0679 100644 (file)
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -147,7 +147,7 @@ void
 _cygtls::remove (DWORD wait)
 {
   debug_printf ("wait %p", wait);
-  if (!locals.exitsock)
+  if (!locals.exitsock || exit_state >= ES_FINAL)
     return;
   if (wait)
     {

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index 2c3652c6f4131f581122d812244c641e35da3efa..d719b333434cc976cb5d6d1d49026696b0acf21c 100644 (file)
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -355,7 +355,8 @@ out1:
 void
 _cygtls::remove_wq (DWORD wait)
 {
-  if (sync_proc_subproc && sync_proc_subproc.acquire (wait))
+  if (exit_state < ES_FINAL && sync_proc_subproc
+      && sync_proc_subproc.acquire (wait))
     {
       for (waitq *w = &waitq_head; w->next != NULL; w = w->next)
        if (w->next == &wq)