mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an arithmetic overflow in reparser

Browse Source
This commit is contained in:
pcpthm 2019-03-22 02:22:06 +09:00
parent 4c7142d0c9
commit 0acb61a911
3 changed files with 11 additions and 5 deletions
crates/ra_syntax
src
parsing
reparsing.rs
syntax_error.rs
tests/data/reparse/fuzz-failures
0000.rs

4
crates/ra_syntax/src/parsing/reparsing.rs

@ -130,11 +130,11 @@ fn merge_errors(
if e.offset() <= old_node.range().start() {
res.push(e)
} else if e.offset() >= old_node.range().end() {
res.push(e.add_offset(TextUnit::of_str(&edit.insert) - edit.delete.len()));
res.push(e.add_offset(TextUnit::of_str(&edit.insert), edit.delete.len()));
}
}
for e in new_errors {
res.push(e.add_offset(old_node.range().start()));
res.push(e.add_offset(old_node.range().start(), 0.into()));
}
res
}

6
crates/ra_syntax/src/syntax_error.rs

@ -48,10 +48,10 @@ impl SyntaxError {
}
}
pub fn add_offset(mut self, plus_offset: TextUnit) -> SyntaxError {
pub fn add_offset(mut self, plus_offset: TextUnit, minus_offset: TextUnit) -> SyntaxError {
self.location = match self.location {
Location::Range(range) => Location::Range(range + plus_offset),
Location::Offset(offset) => Location::Offset(offset + plus_offset),
Location::Range(range) => Location::Range(range + plus_offset - minus_offset),
Location::Offset(offset) => Location::Offset(offset + plus_offset - minus_offset),
};
self

6
crates/ra_syntax/tests/data/reparse/fuzz-failures/0000.rs Normal file

@ -0,0 +1,6 @@
0
1
0