* fhandler_tty.cc (fhandler_tty_slave::close): Avoid potential crash

	if former open call has been unsuccessful.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a57cd08..4a091f2 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-02  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_tty.cc (fhandler_tty_slave::close): Avoid potential crash
+       if former open call has been unsuccessful.
+
 2010-04-01  Corinna Vinschen  <corinna@vinschen.de>
 
        * nlsfuncs.cc: Fix indentation.

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 4e4dc53..e9471ce 100644 (file)
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -613,10 +613,11 @@ fhandler_tty_slave::close ()
      close this normally.  cgf 2006-05-20 */
   cygheap->manage_console_count ("fhandler_tty_slave::close", -1);
 
-  archetype->usecount--;
+  if (archetype)
+    archetype->usecount--;
   report_tty_counts (this, "closed", "");
 
-  if (archetype->usecount)
+  if (archetype && archetype->usecount)
     {
 #ifdef DEBUGGING
       if (archetype->usecount < 0)