twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-18 21:53:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

stats: fix case where "bytes searched" could be wrong

Browse Source 
Specifically, if the search was instructed to quit early, we might not
have correctly marked the number of bytes consumed.

I don't think this bug occurs when memory maps are used to read the
haystack.

Closes #2944
This commit is contained in:
Andrew Gallant
2025-08-17 10:44:02 -04:00
parent e99de53e31
commit 48bf394585
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/searcher/src/searcher/glue.rs
View File

@@ -37,7 +37,11 @@ where
pub(crate) fn run(mut self) -> Result<(), S::Error> {
if self.core.begin()? {
while self.fill()? && self.core.match_by_line(self.rdr.buffer())? {
while self.fill()? {
if !self.core.match_by_line(self.rdr.buffer())? {
self.consume_remaining();
break;
}
}
}
self.core.finish(
@@ -46,6 +50,11 @@ where
)
}
fn consume_remaining(&mut self) {
let consumed = self.core.pos();
self.rdr.consume(consumed);
}
fn fill(&mut self) -> Result<bool, S::Error> {
assert!(self.rdr.buffer()[self.core.pos()..].is_empty());