From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id A7F79383E832; Mon, 4 May 2020 09:21:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7F79383E832 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] setup_pseudoconsole(): handle missing/incorrect helper gracefully X-Act-Checkin: newlib-cygwin X-Git-Author: Johannes Schindelin X-Git-Refname: refs/heads/master X-Git-Oldrev: 453b6d17bf0581e55258c5eb6dc7afbad1927cab X-Git-Newrev: 717db9fd1ce369d5279480613bcf61daf658309a Message-Id: <20200504092121.A7F79383E832@sourceware.org> Date: Mon, 4 May 2020 09:21:21 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 09:21:21 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=717db9fd1ce369d5279480613bcf61daf658309a commit 717db9fd1ce369d5279480613bcf61daf658309a Author: Johannes Schindelin Date: Sat May 2 15:03:07 2020 +0200 setup_pseudoconsole(): handle missing/incorrect helper gracefully When `cygwin-console-helper.exe` is either missing, or corresponds to a different Cygwin runtime, we currently wait forever while setting up access to the pseudo console, even long after the process is gone that was supposed to signal that it set up access to the pseudo console. Let's handle that more gracefully: if the process exited without signaling, we cannot use the pseudo console. In that case, let's just fall back to not using it. Signed-off-by: Johannes Schindelin Diff: --- winsup/cygwin/fhandler_tty.cc | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index b2e725d5d..8547ec7c4 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -3496,7 +3496,23 @@ fhandler_pty_master::setup_pseudoconsole () TRUE, EXTENDED_STARTUPINFO_PRESENT, NULL, NULL, &si_helper.StartupInfo, &pi_helper)) goto cleanup_event_and_pipes; - WaitForSingleObject (hello, INFINITE); + for (;;) + { + DWORD wait_result = WaitForSingleObject (hello, 500); + if (wait_result == WAIT_OBJECT_0) + break; + if (wait_result != WAIT_TIMEOUT) + goto cleanup_helper_process; + DWORD exit_code; + if (!GetExitCodeProcess(pi_helper.hProcess, &exit_code)) + goto cleanup_helper_process; + if (exit_code == STILL_ACTIVE) + continue; + if (exit_code != 0 || + WaitForSingleObject (hello, 500) != WAIT_OBJECT_0) + goto cleanup_helper_process; + break; + } CloseHandle (hello); CloseHandle (pi_helper.hThread); /* Retrieve pseudo console handles */