Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 07:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix arithmetic overflow in up-line

Browse source 
The C++ code implicitly relied on wrapping behavior.

There are probably more cases like this.  Maybe we should disable
"overflow-checks" in release mode.
This commit is contained in:
Johannes Altmanninger 2024-01-09 18:11:14 +01:00
parent 114ebe3b8f
commit e84d110995
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fish-rust/src/parse_util.rs
View file

@ -528,10 +528,11 @@ pub fn parse_util_get_offset_from_line(s: &wstr, line: i32) -> Option<usize> {
}
/// Return the total offset of the buffer for the cursor position nearest to the specified position.
pub fn parse_util_get_offset(s: &wstr, line: i32, mut line_offset: usize) -> Option<usize> {
pub fn parse_util_get_offset(s: &wstr, line: i32, line_offset: isize) -> Option<usize> {
let off = parse_util_get_offset_from_line(s, line)?;
let off2 = parse_util_get_offset_from_line(s, line + 1).unwrap_or(s.len() + 1);
let mut line_offset = line_offset as usize;
if line_offset >= off2 - off - 1 {
line_offset = off2 - off - 1;
}

7
fish-rust/src/reader.rs
View file

@ -2648,10 +2648,11 @@ impl ReaderData {
let indent_old = indents[std::cmp::min(indents.len() - 1, base_pos_old)];
let indent_new = indents[std::cmp::min(indents.len() - 1, base_pos_new)];
let indent_old = usize::try_from(indent_old).unwrap();
let indent_new = usize::try_from(indent_new).unwrap();
let indent_old = isize::try_from(indent_old).unwrap();
let indent_new = isize::try_from(indent_new).unwrap();
let line_offset_old = el.position() - base_pos_old;
let line_offset_old =
isize::try_from(el.position() - base_pos_old).unwrap();
let total_offset_new = parse_util_get_offset(
el.text(),
line_new,

10
tests/checks/tmux-bind.fish
View file

@ -9,3 +9,13 @@ tmux-sleep
isolated-tmux capture-pane -p
# CHECK: prompt 0> echo 12345
# CHECK: echo abcde
isolated-tmux send-keys C-c
tmux-sleep
isolated-tmux send-keys C-l
isolated-tmux send-keys begin Enter 'echo 1' Enter e n d C-p 23
tmux-sleep
isolated-tmux capture-pane -p
# CHECK: prompt 0> begin
# CHECK: echo 123
# CHECK: end