fix: panic on multi-byte UTF-8 in grep submatches#2170
Open
LeonidasZhak wants to merge 1 commit into
Open
Conversation
When git grep output contains multi-byte UTF-8 characters (e.g. ©, emoji, CJK), the byte offsets from ripgrep may not align with char boundaries, causing a panic when slicing the string. Use floor_char_boundary() to snap indices to valid char boundaries before slicing. Fixes dandavison#1448
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
Fixes a panic when
git grepoutput contains multi-byte UTF-8 characters (e.g. ©, emoji, CJK characters).Problem
The byte offsets from ripgrep submatches may not align with UTF-8 char boundaries. When delta tries to slice the string at these offsets, it panics:
Solution
Use
floor_char_boundary()to snap byte indices to valid char boundaries before slicing. This ensures safe string slicing regardless of the character encoding.Changes
src/handlers/grep.rs: Inmake_style_sections(), added char boundary checks before string slicing.Fixes #1448