JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: console: ignore NUL byte on write in xterm emulation mode as well

Browse Source 
A NUL byte in the output stream got accidentally not handled as IGN char
in xterm console mode.  The internal mbtowc conversion doesn't handle
embedded NUL values gracefully, it always stops converting at NUL bytes.
This broke the output of strings with embedded NUL bytes.

Fix this by always skipping IGN chars in the "normal char output loop"
and make sure not to move the cursor one position to the right, as in
legacy console mode.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2020-02-20 14:48:03 +01:00
parent 7dac41db18
commit c9f153580b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/fhandler_console.cc
View File

@ -2641,6 +2641,7 @@ fhandler_console::write_normal (const unsigned char *src,
memset (&ps, 0, sizeof ps); memset (&ps, 0, sizeof ps);
while (found < end while (found < end
&& found - src < CONVERT_LIMIT && found - src < CONVERT_LIMIT
&& base_chars[*found] != IGN
&& ((wincap.has_con_24bit_colors () && !con_is_legacy) && ((wincap.has_con_24bit_colors () && !con_is_legacy)
|| base_chars[*found] == NOR) ) || base_chars[*found] == NOR) )
{ {
@ -2732,7 +2733,8 @@ do_print:
cursor_rel (-1, 0); cursor_rel (-1, 0);
break; break;
case IGN: case IGN:
cursor_rel (1, 0); if (!wincap.has_con_24bit_colors () || con_is_legacy)
cursor_rel (1, 0);
break; break;
case CR: case CR:
cursor_get (&x, &y); cursor_get (&x, &y);