mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

53394: drop OSC and DCS sequences in key input

Browse source 
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.
This commit is contained in:
Oliver Kiddle 2025-03-03 01:15:00 +01:00
parent d315401a03
commit 71f35afa1c
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2025-03-03 Oliver Kiddle <opk@zsh.org>
* 53394: Src/Zle/zle_keymap.c: drop OSC and DCS sequences in key
input as they are likely to be terminal query responses not keys
2025-03-02 Bart Schaefer <schaefer@toltec-ubuntu>
* 53368: Src/options.c: ignore no-op changes to EMACS/VI options

28
Src/Zle/zle_keymap.c
View file

@ -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)