Repository navigation
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.
Description
A malformed hunk source line beginning with a multibyte UTF-8 character panics before the parser can return
DiffParseError.parse_hunksliced&content[1..]before checking whether the first byte was a valid hunk prefix.Validate the ASCII prefix first, then remove it only for space,
+and-. Invalid prefixes retain the existing error message and one-based patch line. Empty context lines stripped by editors/mail transports remain supported.Minimal input:
--- a/a\n+++ b/a\n@@ -1 +1 @@\néinvalid\n.Regression coverage
é,中,😀) and an invalid ASCII prefix return the line-4 parse error.Public API
None. No Base-layer, dependency or UI changes.
Validation
369f7a8f5a6602da980f008cf726467588ad517f.2846b8d612f96ebd5dda65c1348bf104200d5149, including standard macOS/Linux/Windows tests, GPUI Fast, lint and Shell checks.cargo test -p gpui-component --lib diff::parser_tests.AI-assisted: prepared and independently source-reviewed with OpenAI Codex.