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

fish_indent: Fix crash if errors aren't sorted

Browse Source 
I've found this for `echo \x1e\<\) | ./fish_indent`

Which is *extremely* broken script, to be fair
This commit is contained in:
Fabian Boehm
2024-01-10 19:33:00 +01:00
parent 76ddfca420
commit ed251578d1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fish-rust/src/fish_indent.rs
View File

@@ -471,8 +471,13 @@ fn gap_text_to(&self, end: usize) -> SourceRange {
fn range_contained_error(&self, r: SourceRange) -> bool {
let errs = self.errors.as_ref().unwrap();
let range_is_before = |x: SourceRange, y: SourceRange| x.end().cmp(&y.start());
assert!(errs.is_sorted_by(|&x, &y| Some(range_is_before(x, y))));
errs.partition_point(|&range| range_is_before(range, r).is_lt()) != errs.len()
// FIXME: We want to have the errors sorted, but in some cases they aren't.
// I suspect this is when the ast is unwinding because the source is fudged up.
if errs.is_sorted_by(|&x, &y| Some(range_is_before(x, y))) {
errs.partition_point(|&range| range_is_before(range, r).is_lt()) != errs.len()
} else {
false
}
}
// Emit the gap text before a source range.