h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-16 23:41:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some invalid assertions parsing keys

Browse Source 
For example the terminal sending « CSI 55296 ; 5 u » would crash fish.

(cherry picked from commit c7391d1026)
This commit is contained in:
Johannes Altmanninger
2025-05-22 08:49:29 +02:00
parent 3f1add9e21
commit 65fc2b539c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/input_common.rs
View File

@@ -1103,9 +1103,10 @@ fn parse_csi(&mut self, buffer: &mut Vec<u8>) -> Option<KeyEvent> {
char::from_u32(u32::from(function_key(3)) + params[0][0] - 25).unwrap(),
)), // rxvt style
27 => {
let key =
canonicalize_keyed_control_char(char::from_u32(params[2][0]).unwrap());
masked_key(key, None)
let Some(key) = char::from_u32(params[2][0]) else {
return invalid_sequence(buffer);
};
masked_key(canonicalize_keyed_control_char(key), None)
}
28 | 29 => KeyEvent::from(shift(
char::from_u32(u32::from(function_key(5)) + params[0][0] - 28).unwrap(),
@@ -1158,14 +1159,17 @@ fn parse_csi(&mut self, buffer: &mut Vec<u8>) -> Option<KeyEvent> {
57424 => key::End,
57425 => key::Insert,
57426 => key::Delete,
cp => canonicalize_keyed_control_char(char::from_u32(cp).unwrap()),
cp => {
let Some(key) = char::from_u32(cp) else {
return invalid_sequence(buffer);
};
canonicalize_keyed_control_char(key)
}
};
masked_key(
key,
Some(canonicalize_keyed_control_char(
char::from_u32(params[0][1]).unwrap(),
)),
)
let Some(shifted_key) = char::from_u32(params[0][1]) else {
return invalid_sequence(buffer);
};
masked_key(key, Some(canonicalize_keyed_control_char(shifted_key)))
}
b'Z' => KeyEvent::from(shift(key::Tab)),
b'I' => {