Skip to content

fix: binary file check misses binary files where first byte is null #1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keegancsmith merged 1 commit into from
May 4, 2026
+4 −4
Merged

fix: binary file check misses binary files where first byte is null #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index/index_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3409,7 +3409,7 @@ func TestDocChecker(t *testing.T) {
t.Errorf("Check(%q): %v", text, skip)
}
}
for _, text := range []string{"zero\x00byte", "xx", "0123456789abcdefghi"} {
for _, text := range []string{"zero\x00byte", "\x00starts with null byte", "xx", "0123456789abcdefghi"} {
if skip := docChecker.Check([]byte(text), 15, false); skip == SkipReasonNone {
t.Errorf("Check(%q) succeeded", text)
}
Expand All @@ -3421,7 +3421,7 @@ func TestDocChecker(t *testing.T) {
t.Errorf("Check(%q): %v", text, skip)
}
}
for _, text := range []string{"zero\x00byte", "xx"} {
for _, text := range []string{"zero\x00byte", "\x00starts with null byte", "xx"} {
if skip := docChecker.Check([]byte(text), 15, true); skip == SkipReasonNone {
t.Errorf("Check(%q) succeeded", text)
}
Expand Down
4 changes: 2 additions & 2 deletions index/shard_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ func (b *ShardBuilder) Add(doc Document) error {
// Skip binary check if already computed (e.g., by Builder.Add
// which calls DocChecker.Check before docs reach buildShard).
if doc.Category == FileCategoryMissing {
if index := bytes.IndexByte(doc.Content, 0); index > 0 {
if index := bytes.IndexByte(doc.Content, 0); index >= 0 {
doc.SkipReason = SkipReasonBinary
}
}
Expand Down Expand Up @@ -686,7 +686,7 @@ func (t *DocChecker) Check(content []byte, maxTrigramCount int, allowLargeFile b
return SkipReasonTooSmall
}

if index := bytes.IndexByte(content, 0); index > 0 {
if index := bytes.IndexByte(content, 0); index >= 0 {
return SkipReasonBinary
}

Expand Down