From 71f35afa1cd48d6c25a517797e543cb2aa23a47b Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Mon, 3 Mar 2025 01:15:00 +0100
Subject: 53394: drop OSC and DCS sequences in key input

They are likely to be terminal query responses not keys. If they do match a
keybinding that's not affected. Also does likewise for certain CSI sequences.
---
 Src/Zle/zle_keymap.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'Src')

diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index 5012917f5..ce52abe66 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1580,7 +1580,7 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)
     Thingy func = t_undefinedkey;
     char *str = NULL;
     int lastlen = 0, lastc = lastchar;
-    int timeout = 0, csi = 0;
+    int timeout = 0, csi = 0, oscdcs = 0;
 
     keybuflen = 0;
     keybuf[0] = 0;
@@ -1647,14 +1647,38 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)
 		if (keybuf[keybuflen - 1] >= 0x40 &&
 			keybuf[keybuflen - 1] <= 0x7e && lastlen > csi - 2 &&
 			lastlen <= csi) {
+		    if (keybuf[csi] == '?' && (keybuf[keybuflen - 1] == 'c' ||
+			keybuf[keybuflen - 1] == 'u'))
+		    { /* is a terminal query response - discard */
+			keybuflen = csi - 2;
+			timeout = csi = 0;
+			continue;
+		    }
 		    func = t_undefinedkey;
 		    lastlen = keybuflen;
 		}
 		csi = 0;
 	    }
 	}
+	/* An OSC or DCS sequence is likely a late arriving terminal query
+	 * response. Keep looping; if we reach an ST, discard the sequence
+	 * - unless we first match a keybinding or a keytimeout elapses. */
+	if (oscdcs) {
+	    if (keybuf[keybuflen - 1] == '\007' || /* BEL sometimes used */
+		(keybuf[keybuflen - 2] == '\033' &&
+		 keybuf[keybuflen - 1] == '\\') ||
+		(keybuf[keybuflen - 2] == Meta && /* ST can be 0x9b */
+		 (unsigned char) keybuf[keybuflen - 1] == (0x9b ^ 32)))
+	    {
+		keybuflen = oscdcs - 2; /* discard */
+		timeout = oscdcs = 0;
+		continue;
+	    }
+	} else if (keybuflen >= 2 && keybuf[keybuflen - 2] == '\033' &&
+		(keybuf[keybuflen - 1] == ']' || keybuf[keybuflen - 1] == 'P'))
+	    oscdcs = keybuflen;
 
-	if (!ispfx && !csi)
+	if (!ispfx && !csi && !oscdcs)
 	    break;
     }
     if(!lastlen && keybuflen)
-- 
cgit v1.2.3