* cygheap.cc (init_cygheap::close_ctty): Avoid closing console-cttys since they

don't use archetypes and this will just result in double frees.
* dll_init.cc (dll_list::protect): Define.
(dll_list::alloc): Guard list access.
(dll_list::detach): Ditto.
* dll_init.h (dll_list::protect): Declare new muto.
(dll_list::guard): Define/declare function to guard list access.
* fhandler_termios.cc (fhandler_termios::sigflush): Avoid SEGV in pathological
condition of get_ttyp() == NULL.

1 files changed, 10 insertions, 0 deletions

diff --git a/winsup/cygwin/dll_init.h b/winsup/cygwin/dll_init.h
index b37406e82..d14cc6cb9 100644
--- a/winsup/cygwin/dll_init.h
+++ b/winsup/cygwin/dll_init.h
@@ -72,6 +72,7 @@ class dll_list
   dll *end;
   dll *hold;
   dll_type hold_type;
+  static muto protect;
 public:
   dll start;
   int tot;
@@ -90,13 +91,22 @@ public:
 	break;
     return hold;
   }
+
   dll *istart (dll_type t)
   {
     hold_type = t;
     hold = &start;
     return inext ();
   }
+  void guard(bool lockit)
+  {
+    if (lockit)
+      protect.acquire ();
+    else
+      protect.release ();
+  }
   friend void dll_global_dtors ();
+  dll_list () { protect.init ("dll_list"); }
 };
 
 extern dll_list dlls;