diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-04-09 07:18:22 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-04-09 07:24:30 +0300 |
| commit | 7ed6d0249f1f06bb42b13587598fbbb30cf81a82 (patch) | |
| tree | a220f0e1b8045f3e1796aefa1246022d1f8c532e | |
| parent | b88315e74d3983cf28fe7521675dae5d6b78b428 (diff) | |
Cygwin: pty: Close pseudo console only if the process is the owner.
- Currently, close_pseudoconsole() is called unconditionally from
fhandler_termios::process_sigs() on Ctrl-C. This causes deadlock
if Ctrl-C is pressed while setup_pseudoconsole() is called. With
this patch, close_pseudoconsole() is called only if the master
process is the owner of the nat-pipe to avoid the deadlock.
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 367525005..36992324d 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -4138,7 +4138,8 @@ void fhandler_pty_slave::close_pseudoconsole_if_necessary (tty *ttyp, fhandler_termios *fh) { - if (fh->get_major () == DEV_PTYM_MAJOR && ttyp->pcon_activated) + if (fh->get_major () == DEV_PTYM_MAJOR && ttyp->pcon_activated + && pcon_pid_self (ttyp->pcon_pid)) { fhandler_pty_master *ptym = (fhandler_pty_master *) fh; WaitForSingleObject (ptym->pcon_mutex, INFINITE); |