From 27202a1b143d19ceadfac2584f208392e4e0859a Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Thu, 19 Dec 2019 20:03:30 +0900
Subject: [PATCH] Cygwin: pty: Fix ESC[?3h and ESC[?3l handling again.

- Even with commit fe512b2b12a2cea8393d14f038dc3914b1bf3f60, pty
  still has a problem in ESC[?3h and ESC[?3l handling if invalid
  sequence such as ESC[?$ is sent. This patch fixes the issue.
---
 winsup/cygwin/fhandler_tty.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 8c3a6e72e..f10f0fc61 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1263,7 +1263,7 @@ fhandler_pty_slave::push_to_pcon_screenbuffer (const char *ptr, size_t len)
     {
       p0 += 3;
       bool exist_arg_3 = false;
-      while (p0 < buf + nlen && !isalpha (*p0))
+      while (p0 < buf + nlen && (isdigit (*p0) || *p0 == ';'))
 	{
 	  int arg = 0;
 	  while (p0 < buf + nlen && isdigit (*p0))