diff options
author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2024-02-03 00:54:23 +0900 |
---|---|---|
committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2024-02-03 01:01:53 +0900 |
commit | c2be9bf5eb687389e4d0385839f2f5b78bb820be (patch) | |
tree | 21396e831874f8b053650b3a0edbe2e11bfcf1f7 /winsup/cygwin/fhandler/console.cc | |
parent | 084f848ab9a51d0125491a6f2a7a741f9df73218 (diff) | |
download | newlib-c2be9bf5eb687389e4d0385839f2f5b78bb820be.zip newlib-c2be9bf5eb687389e4d0385839f2f5b78bb820be.tar.gz newlib-c2be9bf5eb687389e4d0385839f2f5b78bb820be.tar.bz2 |
Cygwin: console: Avoid slipping past disable_master_thread check.
If disable_master_thread flag is set between the code checking that
flag not be set and the code acquiring input_mutex, input record is
processed once after setting disable_master_thread flag. This patch
prevents that.
Fixes: d4aacd50e6cf ("Cygwin: console: Add missing input_mutex guard.")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Diffstat (limited to 'winsup/cygwin/fhandler/console.cc')
-rw-r--r-- | winsup/cygwin/fhandler/console.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler/console.cc b/winsup/cygwin/fhandler/console.cc index 6a42b49..1c8d383 100644 --- a/winsup/cygwin/fhandler/console.cc +++ b/winsup/cygwin/fhandler/console.cc @@ -420,6 +420,12 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp) } WaitForSingleObject (p->input_mutex, mutex_timeout); + /* Ensure accessing input recored is not disabled. */ + if (con.disable_master_thread) + { + ReleaseMutex (p->input_mutex); + continue; + } total_read = 0; switch (cygwait (p->input_handle, (DWORD) 0)) { @@ -4545,8 +4551,6 @@ fhandler_console::set_disable_master_thread (bool x, fhandler_console *cons) return; } const _minor_t unit = cons->get_minor (); - if (con.disable_master_thread == x) - return; cons->acquire_input_mutex (mutex_timeout); con.disable_master_thread = x; cons->release_input_mutex (); |