Fix HtmlUtils unescape for supplementary chars #35477
Open
+46
−1
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.
Closes: #35426
Currently,
HtmlUtils.htmlUnescape()
does not correctly handle numeric character references for Unicode supplementary characters (e.g., emojis).For example, an entity like
😀
(😀) is incorrectly converted to a garbled character corresponding toU+F600
due to data truncation.Step to Reproduce
Cause
The root cause was a problematic cast to a 16-bit
char
in theHtmlCharacterEntityDecoder
. This operation truncated any Unicode code point value greater thanU+FFFF
, leading to the loss of the most significant bits.Solution
This PR resolves the issue by replacing the direct
(char)
cast with a call toStringBuilder.appendCodePoint()
.The
appendCodePoint()
method is designed to handle the full range of Unicode code points. It correctly converts supplementary characters into a two-character surrogate pair, ensuring that all characters are unescaped without data loss. A corresponding unit test has been added to verify this fix.