Prevent PatchMake panic on invalid UTF-8 - #158
Open
cneuralnetwork wants to merge 1 commit into
Open
Conversation
cneuralnetwork
marked this pull request as ready for review
August 2, 2026 15:48
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
1 participant
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
DiffMain's diffsPatchMake(text1, text2)andPatchMake(text1, diffs)Root cause
DiffMainconverts input strings to[]rune, replacing the one-byte invalid input with U+FFFD (three UTF-8 bytes).patchMake2retained the original one-byte source, then used the three-byte delete length to slice it, causingslice bounds out of range [3:1].The fix adopts the normalized source only when it is exactly the source described by the diffs. Handcrafted diffs that intentionally contain raw invalid bytes continue to use those bytes. This stays consistent with the invalid-UTF-8 behavior documented by
DiffMainand does not introduce new byte-level diff semantics.Validation
go test ./...go test -race -count=1 -timeout 120s ./...go vet ./...Fixes #157