From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id B389B39B680E; Wed, 21 Apr 2021 15:43:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B389B39B680E 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 fallback processing in setup_pseudoconsole(). X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: 01387f1ff41eada228bafacbfb95f49fb8a9aca2 X-Git-Newrev: 6004ea977bb33b1ecd49a213f04c8657be3d7b3f Message-Id: <20210421154350.B389B39B680E@sourceware.org> Date: Wed, 21 Apr 2021 15:43:50 +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: Wed, 21 Apr 2021 15:43:50 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6004ea977bb33b1ecd49a213f04c8657be3d7b3f commit 6004ea977bb33b1ecd49a213f04c8657be3d7b3f Author: Takashi Yano Date: Wed Apr 21 12:06:43 2021 +0900 Cygwin: pty: Fix fallback processing in setup_pseudoconsole(). - Currently, the fallback processing in setup_pseudoconsole() when helper process error occurs does not work properly. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler_tty.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index e4480771b..530321513 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -3226,15 +3226,15 @@ fhandler_pty_slave::setup_pseudoconsole (bool nopcon) if (wait_result == WAIT_OBJECT_0) break; if (wait_result != WAIT_TIMEOUT) - goto cleanup_helper_process; + goto cleanup_helper_with_hello; DWORD exit_code; if (!GetExitCodeProcess (pi.hProcess, &exit_code)) - goto cleanup_helper_process; + goto cleanup_helper_with_hello; if (exit_code == STILL_ACTIVE) continue; if (exit_code != 0 || WaitForSingleObject (hello, 500) != WAIT_OBJECT_0) - goto cleanup_helper_process; + goto cleanup_helper_with_hello; break; } CloseHandle (hello); @@ -3349,6 +3349,10 @@ skip_create: return true; +cleanup_helper_with_hello: + CloseHandle (hello); + CloseHandle (pi.hThread); + goto cleanup_helper_process; cleanup_pcon_in: CloseHandle (hpConIn); cleanup_helper_process: @@ -3358,10 +3362,10 @@ cleanup_helper_process: goto skip_close_hello; cleanup_event_and_pipes: CloseHandle (hello); +skip_close_hello: get_ttyp ()->pcon_start = false; get_ttyp ()->pcon_start_pid = 0; get_ttyp ()->pcon_activated = false; -skip_close_hello: CloseHandle (goodbye); CloseHandle (hr); CloseHandle (hw);