From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127550 invoked by alias); 14 Jan 2020 16:30:40 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 127508 invoked by uid 9078); 14 Jan 2020 16:30:40 -0000 Date: Tue, 14 Jan 2020 16:30:00 -0000 Message-ID: <20200114163040.127507.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Fix the issue regarding open and close multiple PTYs. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: a1c7e920845ab21185f18950be3d84f4312222de X-Git-Newrev: bb7741acf800819a27c4edacddd231c6748fa1c9 X-SW-Source: 2020-q1/txt/msg00008.txt https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=bb7741acf800819a27c4edacddd231c6748fa1c9 commit bb7741acf800819a27c4edacddd231c6748fa1c9 Author: Takashi Yano Date: Tue Jan 14 13:10:54 2020 +0900 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. Diff: --- 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 0837b63..84900fe 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");