From 452e91a8fa1f02d917feb4ca08621c921aaa81e4 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Tue, 14 Jan 2020 13:10:54 +0900 Subject: [PATCH] Cygwin: pty: Fix the issue regarding open and close multiple PTYs. - If two PTYs are opened in the same process and the first one is closed, the helper process for the first PTY remains running. This patch fixes the issue. --- winsup/cygwin/fhandler_tty.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 0837b63e1..84900fee8 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -2224,8 +2224,7 @@ fhandler_pty_master::close () termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex); if (!NT_SUCCESS (status)) debug_printf ("NtQueryObject: %y", status); - else if (obi.HandleCount == (get_pseudo_console () ? 2 : 1)) - /* Helper process has inherited one. */ + else if (obi.HandleCount == 1) { termios_printf ("Closing last master of pty%d", get_minor ()); /* Close Pseudo Console */ @@ -3167,14 +3166,14 @@ fhandler_pty_master::setup_pseudoconsole () get_ttyp ()->attach_pcon_in_fork = true; SIZE_T bytesRequired; - InitializeProcThreadAttributeList (NULL, 1, 0, &bytesRequired); + InitializeProcThreadAttributeList (NULL, 2, 0, &bytesRequired); STARTUPINFOEXW si_helper; ZeroMemory (&si_helper, sizeof (si_helper)); si_helper.StartupInfo.cb = sizeof (STARTUPINFOEXW); si_helper.lpAttributeList = (PPROC_THREAD_ATTRIBUTE_LIST) HeapAlloc (GetProcessHeap (), 0, bytesRequired); InitializeProcThreadAttributeList (si_helper.lpAttributeList, - 1, 0, &bytesRequired); + 2, 0, &bytesRequired); UpdateProcThreadAttribute (si_helper.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, @@ -3186,6 +3185,14 @@ fhandler_pty_master::setup_pseudoconsole () /* Create a pipe for receiving pseudo console handles */ HANDLE hr, hw; CreatePipe (&hr, &hw, &sec_none, 0); + /* Inherit only handles which are needed by helper. */ + HANDLE handles_to_inherit[] = {hello, goodbye, hw}; + UpdateProcThreadAttribute (si_helper.lpAttributeList, + 0, + PROC_THREAD_ATTRIBUTE_HANDLE_LIST, + handles_to_inherit, + sizeof (handles_to_inherit), + NULL, NULL); /* Create helper process */ WCHAR cmd[MAX_PATH]; path_conv helper ("/bin/cygwin-console-helper.exe");