mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-02-28 12:05:47 +08:00
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>
This commit is contained in:
parent
aa73e11524
commit
9bcfd06045
@ -420,6 +420,12 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
WaitForSingleObject (p->input_mutex, mutex_timeout);
|
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;
|
total_read = 0;
|
||||||
switch (cygwait (p->input_handle, (DWORD) 0))
|
switch (cygwait (p->input_handle, (DWORD) 0))
|
||||||
{
|
{
|
||||||
@ -4545,8 +4551,6 @@ fhandler_console::set_disable_master_thread (bool x, fhandler_console *cons)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const _minor_t unit = cons->get_minor ();
|
const _minor_t unit = cons->get_minor ();
|
||||||
if (con.disable_master_thread == x)
|
|
||||||
return;
|
|
||||||
cons->acquire_input_mutex (mutex_timeout);
|
cons->acquire_input_mutex (mutex_timeout);
|
||||||
con.disable_master_thread = x;
|
con.disable_master_thread = x;
|
||||||
cons->release_input_mutex ();
|
cons->release_input_mutex ();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user