From 731af9444c01b53a0f4b3c6fefc06670fe002e89 Mon Sep 17 00:00:00 2001 From: izeye Date: Fri, 17 Dec 2021 23:11:24 +0900 Subject: [PATCH 1/2] Polish HtmlCharacterEntityDecoder See gh-27833 --- .../web/util/HtmlCharacterEntityDecoder.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 2d6db518b20..6b966e67882 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 @@ -70,13 +70,6 @@ class HtmlCharacterEntityDecoder { this.nextSemicolonPosition = this.originalMessage.indexOf(';', this.nextPotentialReferencePosition + 1); } - boolean isPotentialReference = (this.nextPotentialReferencePosition != -1 && - this.nextSemicolonPosition != -1 && - this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE); - - if (isPotentialReference) { - break; - } if (this.nextPotentialReferencePosition == -1) { break; } @@ -85,6 +78,10 @@ class HtmlCharacterEntityDecoder { break; } + if (this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE) { + break; + } + this.nextPotentialReferencePosition = this.nextPotentialReferencePosition + 1; } while (this.nextPotentialReferencePosition != -1); From ac1032ffc99d0c8652fe054c62ff40946ee84b83 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 21 Dec 2021 09:34:39 +0100 Subject: [PATCH 2/2] Polish formatting See gh-27833 --- .../org/springframework/web/util/HtmlCharacterEntityDecoder.java | 1 - 1 file changed, 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 6b966e67882..b99b97fea97 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 @@ -77,7 +77,6 @@ class HtmlCharacterEntityDecoder { this.nextPotentialReferencePosition = -1; break; } - if (this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE) { break; }