twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-20 22: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

2
CHANGELOG.md
View File

@@ -21,6 +21,8 @@ Bug fixes:
Make `rg -vf file` where `file` is empty match everything. Make `rg -vf file` where `file` is empty match everything.
* [BUG #2177](https://github.com/BurntSushi/ripgrep/issues/2177): * [BUG #2177](https://github.com/BurntSushi/ripgrep/issues/2177):
Ignore a UTF-8 BOM marker at the start of `.gitignore` (and similar files). Ignore a UTF-8 BOM marker at the start of `.gitignore` (and similar files).
* [BUG #2944](https://github.com/BurntSushi/ripgrep/pull/2944):
Fix a bug where the "bytes searched" in `--stats` output could be incorrect.
Feature enhancements: Feature enhancements:

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

@@ -37,7 +37,11 @@ where
pub(crate) fn run(mut self) -> Result<(), S::Error> { pub(crate) fn run(mut self) -> Result<(), S::Error> {
if self.core.begin()? { 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( 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> { fn fill(&mut self) -> Result<bool, S::Error> {
assert!(self.rdr.buffer()[self.core.pos()..].is_empty()); assert!(self.rdr.buffer()[self.core.pos()..].is_empty());

7
tests/regression.rs
View File

@@ -1454,3 +1454,10 @@ rgtest!(r2658_null_data_line_regexp, |dir: Dir, mut cmd: TestCommand| {
let got = cmd.args(&["--null-data", "--line-regexp", r"bar"]).stdout(); let got = cmd.args(&["--null-data", "--line-regexp", r"bar"]).stdout();
eqnice!("haystack:bar\0", got); eqnice!("haystack:bar\0", got);
}); });
// See: https://github.com/BurntSushi/ripgrep/pull/2944
rgtest!(r2944_incorrect_bytes_searched, |dir: Dir, mut cmd: TestCommand| {
dir.create("haystack", "foo1\nfoo2\nfoo3\nfoo4\nfoo5\n");
let got = cmd.args(&["--stats", "-m2", "foo", "."]).stdout();
assert!(got.contains("10 bytes searched\n"));
});