fix(patch): prevent invalid fuzzy match ranges#2686
Merged
amitksingh1490 merged 5 commits intomainfrom Mar 25, 2026
Merged
Conversation
…dd out-of-bounds error handling
…andle mixed line endings
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
Fix incorrect range computation for fuzzy search matches in
fs_patchand add bounds checking to prevent out-of-range replacements.Context
Range::from_search_matchpreviously derived byte offsets by assuming a single line-ending style across the entire file. That could produce incorrect ranges for content with mixed line endings, and downstream replacement logic could then attempt to index outside the source buffer.Changes
RangeOutOfBoundserror before slicing replacement rangesKey Implementation Details
The fix is centered in
crates/forge_services/src/tool_services/fs_patch.rs, where range creation now tracks exact line start/end byte offsets instead of inferring offsets from a detected newline length. Replacement now validates the computed range before indexing into the source string.Testing
cargo test -p forge_services fs_patch