public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Fix fallback processing in setup_pseudoconsole(). Date: Wed, 21 Apr 2021 15:43:50 +0000 (GMT) [thread overview] Message-ID: <20210421154350.B389B39B680E@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6004ea977bb33b1ecd49a213f04c8657be3d7b3f commit 6004ea977bb33b1ecd49a213f04c8657be3d7b3f Author: Takashi Yano <takashi.yano@nifty.ne.jp> 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);
reply other threads:[~2021-04-21 15:43 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210421154350.B389B39B680E@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).