libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-22 00:38:06 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: console: Prevent special keys processing from drop.

Browse Source 
- There was a potential risk to drop special key processing when
  process_input_messsage() is called intermittently. This patch
  fixes the issue.
This commit is contained in:
Takashi Yano 2022-03-02 09:55:52 +09:00
parent 2b4d4728f2
commit 020fa7ed7b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/fhandler.h
View File

@ -2067,6 +2067,8 @@ class dev_console
char *cons_rapoi; char *cons_rapoi;
bool cursor_key_app_mode; bool cursor_key_app_mode;
bool disable_master_thread; bool disable_master_thread;
int num_processed; /* Number of input events in the current input buffer
already processed by cons_master_thread(). */
inline UINT get_console_cp (); inline UINT get_console_cp ();
DWORD con_to_str (char *d, int dlen, WCHAR w); DWORD con_to_str (char *d, int dlen, WCHAR w);

22
winsup/cygwin/fhandler_console.cc
View File

@ -200,7 +200,6 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
} }
}; };
termios &ti = ttyp->ti; termios &ti = ttyp->ti;
int processed_up_to = -1;
while (con.owner == myself->pid) while (con.owner == myself->pid)
{ {
DWORD total_read, n, i; DWORD total_read, n, i;
@ -223,17 +222,17 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
if (total_read == INREC_SIZE /* Working space full */ if (total_read == INREC_SIZE /* Working space full */
&& cygwait (p->input_handle, (DWORD) 0) == WAIT_OBJECT_0) && cygwait (p->input_handle, (DWORD) 0) == WAIT_OBJECT_0)
{ {
const int incr = min (processed_up_to + 1, additional_space); const int incr = min (con.num_processed, additional_space);
ReadConsoleInputW (p->input_handle, ReadConsoleInputW (p->input_handle,
input_rec + total_read, incr, &n); input_rec + total_read, incr, &n);
/* Discard oldest n events. */ /* Discard oldest n events. */
memmove (input_rec, input_rec + n, m::bytes (total_read)); memmove (input_rec, input_rec + n, m::bytes (total_read));
processed_up_to -= n; con.num_processed -= n;
nowait = true; nowait = true;
} }
break; break;
case WAIT_TIMEOUT: case WAIT_TIMEOUT:
processed_up_to = -1; con.num_processed = 0;
case WAIT_SIGNALED: case WAIT_SIGNALED:
case WAIT_CANCELED: case WAIT_CANCELED:
break; break;
@ -256,7 +255,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
ttyp->kill_pgrp (SIGWINCH); ttyp->kill_pgrp (SIGWINCH);
} }
} }
for (i = processed_up_to + 1; i < total_read; i++) for (i = con.num_processed; i < total_read; i++)
{ {
wchar_t wc; wchar_t wc;
char c; char c;
@ -279,7 +278,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
ttyp->output_stopped = false; ttyp->output_stopped = false;
if (ti.c_lflag & NOFLSH) if (ti.c_lflag & NOFLSH)
goto remove_record; goto remove_record;
processed_up_to = -1; con.num_processed = 0;
goto skip_writeback; goto skip_writeback;
default: /* not signalled */ default: /* not signalled */
break; break;
@ -312,7 +311,7 @@ remove_record:
i--; i--;
} }
} }
processed_up_to = total_read - 1; con.num_processed = total_read;
if (total_read) if (total_read)
{ {
do do
@ -449,6 +448,7 @@ fhandler_console::setup ()
shared_console_info->tty_min_state.is_console = true; shared_console_info->tty_min_state.is_console = true;
con.cursor_key_app_mode = false; con.cursor_key_app_mode = false;
con.disable_master_thread = true; con.disable_master_thread = true;
con.num_processed = 0;
} }
} }
@ -1265,14 +1265,17 @@ fhandler_console::process_input_message (void)
} }
out: out:
/* Discard processed recored. */ /* Discard processed recored. */
DWORD dummy;
DWORD discard_len = min (total_read, i + 1); DWORD discard_len = min (total_read, i + 1);
/* If input is signalled, do not discard input here because /* If input is signalled, do not discard input here because
tcflush() is already called from line_edit(). */ tcflush() is already called from line_edit(). */
if (stat == input_signalled && !(ti->c_lflag & NOFLSH)) if (stat == input_signalled && !(ti->c_lflag & NOFLSH))
discard_len = 0; discard_len = 0;
if (discard_len) if (discard_len)
ReadConsoleInputW (get_handle (), input_rec, discard_len, &dummy); {
DWORD discarded;
ReadConsoleInputW (get_handle (), input_rec, discard_len, &discarded);
con.num_processed = max (con.num_processed - discarded, 0);
}
return stat; return stat;
} }
@ -1671,6 +1674,7 @@ fhandler_console::tcflush (int queue)
__seterrno (); __seterrno ();
res = -1; res = -1;
} }
con.num_processed = 0;
release_attach_mutex (); release_attach_mutex ();
} }
return res; return res;