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

screen: Fix crash if prompt contains backspace

Browse Source 
fish_wcwidth_visible can return -1, so usize::try_from fails.

Fixes #11280

(cherry picked from commit c03de2086a)
This commit is contained in:
Fabian Boehm
2025-03-14 16:21:50 +01:00
parent 5cd2ef903a
commit ae3532e9ec
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/screen.rs
View File

@@ -1636,7 +1636,11 @@ fn measure_run_from(
width = next_tab_stop(width);
} else {
// Ordinary char. Add its width with care to ignore control chars which have width -1.
width += usize::try_from(fish_wcwidth_visible(input.char_at(idx))).unwrap();
if let Ok(ww) = usize::try_from(fish_wcwidth_visible(input.char_at(idx))) {
width += ww;
} else {
width = width.saturating_sub(1);
}
}
idx += 1;
}
@@ -1682,7 +1686,8 @@ fn truncate_run(
curr_width = measure_run_from(run, 0, None, cache);
idx = 0;
} else {
let char_width = usize::try_from(fish_wcwidth_visible(c)).unwrap();
// FIXME: In case of backspace, this would remove the last width.
let char_width = usize::try_from(fish_wcwidth_visible(c)).unwrap_or(0);
curr_width -= std::cmp::min(curr_width, char_width);
run.remove(idx);
}