summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <vinschen@redhat.com>2006-07-18 15:17:35 +0000
committerCorinna Vinschen <vinschen@redhat.com>2006-07-18 15:17:35 +0000
commit185ce4867edcc6300fa5733576e39cd1b33ec0a1 (patch)
tree177a68145c0507748457fe0160c32dda00eb4b6d
parentcf435cd28a73dc2fac13e92f5c743dc90193c76f (diff)
downloadgdb-185ce4867edcc6300fa5733576e39cd1b33ec0a1.tar.gz
* tty.cc (tty_list::terminate): Don't enter the busy loop if we don't
own the master.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/tty.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 275dde77e92..8dba361c16b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-18 Christopher Faylor <cgf@timesys.com>
+
+ * tty.cc (tty_list::terminate): Don't enter the busy loop if we don't
+ own the master.
+
2006-07-18 Silvio Laguzzi <slaguzzi@data-al.de>
* sec_acl.cc (acltotext32): Add missing handling of default ACL entry
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index f357b7bfb36..9793c8cc73a 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -145,7 +145,7 @@ tty_list::terminate ()
int ttynum = myself->ctty;
/* Keep master running till there are connected clients */
- if (ttynum != -1 && ttys[ttynum].master_pid == myself->pid)
+ if (ttynum != -1 && tty_master && ttys[ttynum].master_pid == myself->pid)
{
tty *t = ttys + ttynum;
CloseHandle (tty_master->from_master);