Detect binary content beyond the first line - #3877
Draft
Matei02355 wants to merge 2 commits into
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #3554.
Root cause
content_inspectorchecks up to 1024 bytes for a NUL byte, but bat passed only the first line. Random or encrypted data can contain a newline before its first NUL byte, so the shortened sample was classified as UTF-8 and binary bytes were sent to the terminal.The fix snapshots the already-buffered prefix with
BufRead::fill_buf()beforeread_untilsplits out the first line. The snapshot is non-consuming, so no bytes are lost or reordered, and it does not add a post-line blocking read. Empty input is handled without requesting a second EOF event.Compatibility
BOM detection still takes precedence, so UTF-16 input handling is unchanged. ZIP signature detection is also unchanged.
PR #3763 changes the same input initialization path for a distinct issue (#2262: bounding reads for newline-free binary files). If it merges first, this PR will need a small rebase, but the behaviors are complementary.
Validation
cargo test --all-targets --all-features— clean run: 455 passed, 5 ignoredcargo clippy --all-targets --all-features -- -D warningscargo fmt --checkgit diff --check