drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pty: Check response for CSI6n more strictly. 

- Previous code to read response for CSI6n allows invalid response
  such as "CSI Pl; Pc H" other than correct response "CSI Pl; Pc R".
  With this patch, the response is checked more strictly.
This commit is contained in:
Takashi Yano via Cygwin-patches 2020-12-16 18:10:15 +09:00 committed by Corinna Vinschen
parent 532b91d24e
commit da8cebcded
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/fhandler_tty.cc
View File

@ -2682,7 +2682,9 @@ fhandler_pty_slave::term_has_pcon_cap (const WCHAR *env)
len -= n; len -= n;
*p = '\0'; *p = '\0';
char *p1 = strrchr (buf, '\033'); char *p1 = strrchr (buf, '\033');
if (p1 == NULL || sscanf (p1, "\033[%d;%dR", &y1, &x1) != 2) char c;
if (p1 == NULL || sscanf (p1, "\033[%d;%d%c", &y1, &x1, &c) != 3
|| c != 'R')
continue; continue;
wait_cnt = 0; wait_cnt = 0;
break; break;
@ -2715,7 +2717,9 @@ fhandler_pty_slave::term_has_pcon_cap (const WCHAR *env)
len -= n; len -= n;
*p = '\0'; *p = '\0';
char *p2 = strrchr (buf, '\033'); char *p2 = strrchr (buf, '\033');
if (p2 == NULL || sscanf (p2, "\033[%d;%dR", &y2, &x2) != 2) char c;
if (p2 == NULL || sscanf (p2, "\033[%d;%d%c", &y2, &x2, &c) != 3
|| c != 'R')
continue; continue;
break; break;
} }