fix:bug(chat): ensure sanitize_user_prompt handles UTF-8 boundaries correctly
#3087
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
h16rkim
changed the title
sanitize_user_prompt handles UTF-8 boundaries correctlysanitize_user_prompt handles UTF-8 boundaries correctly
h16rkim
changed the title
sanitize_user_prompt handles UTF-8 boundaries correctlysanitize_user_prompt handles UTF-8 boundaries correctly
brandonskiser
requested changes
Oct 3, 2025
| // Limit the size of input to first 4096 bytes, respecting character boundaries | ||
| const MAX_LEN: usize = 4096; | ||
|
|
||
| let truncated = if input.len() > MAX_LEN { |
There was a problem hiding this comment.
We have a util function that does this - https://github.com/aws/amazon-q-developer-cli/blob/main/crates/chat-cli/src/cli/chat/util/mod.rs#L19
Can this be used instead?
There was a problem hiding this comment.
Thank you. I changed it to use truncate_safe function
kensave
approved these changes
Oct 6, 2025
brandonskiser
approved these changes
Oct 6, 2025
|
There’s another PR that fixes a similar UTF-8 boundary bug — can you review it as well? |
|
Thank you for your reviews. Can we merge this PR ? |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Issue #, if available: #3086
Description of changes:
When executing a chat hook, the user’s prompt is sanitized through the
sanitize_user_prompt(prompt)function. This function trims the prompt with a substring if its length is too long (over 4096 bytes).However, in the case of multibyte characters such as those in CJK languages, if a character is cut across a UTF-8 boundary, a panic occurs and the program terminates.
This PR removes such crashes and fixes the sanitize_user_prompt function so that it works correctly.
Screen Capture