From ebf755a0797882d6c2189f83ff6637f15557e92c Mon Sep 17 00:00:00 2001 From: Martin Mirchev Date: Wed, 18 Nov 2026 21:51:33 +0800 Subject: [PATCH] Do not decode numeric references to surrogates in HtmlUtils.htmlUnescape HtmlCharacterEntityDecoder leaves numeric character references beyond Character.MAX_CODE_POINT undecoded, but decodes references to surrogate code points (U+D800 to U+DFFF), which are not characters: "�" becomes a lone high surrogate, i.e. an invalid UTF-16 string that turns into "?" once encoded, for instance as UTF-8. Leave such references undecoded, as is done for out-of-range values. Signed-off-by: Martin Mirchev --- .../web/util/HtmlCharacterEntityDecoder.java | 3 ++- .../java/org/springframework/web/util/HtmlUtilsTests.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java index ba0051246ccc..6571f7f3a868 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java @@ -124,7 +124,8 @@ private boolean processNumberedReference() { int value = (!isHexNumberedReference ? Integer.parseInt(getReferenceSubstring(2)) : Integer.parseInt(getReferenceSubstring(3), 16)); - if (value < 0 || value > Character.MAX_CODE_POINT) { + if (value < 0 || value > Character.MAX_CODE_POINT || + (value >= Character.MIN_SURROGATE && value <= Character.MAX_SURROGATE)) { return false; } this.decodedMessage.appendCodePoint(value); diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java index c9651d236fb8..1ff40acae8a1 100644 --- a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java @@ -91,6 +91,14 @@ void htmlUnescapeHandlesSupplementaryCharactersAsHexadecimal() { assertThat(actualResultFromHex).as("Hexadecimal entity was not converted correctly.").isEqualTo(expectedCharacter); } + @Test + void htmlUnescapeLeavesSurrogateReferencesUnchanged() { + assertThat(HtmlUtils.htmlUnescape("x�y")).isEqualTo("x�y"); + assertThat(HtmlUtils.htmlUnescape("x�y")).isEqualTo("x�y"); + assertThat(HtmlUtils.htmlUnescape("x퟿y")).isEqualTo("x\uD7FFy"); + assertThat(HtmlUtils.htmlUnescape("xy")).isEqualTo("x\uE000y"); + } + @Test void htmlUnescapeHandlesBasicEntities() { String input = "<p>Tom & Jerry's "Show"</p>";