Skip to content

TEXT-215: Prevent decimal numeric entities from wrongly including hexadecimal characters #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbunel35 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TEXT-215: Prevent decimal numeric entities from wrongly including hexadecimal characters #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05280c2
TEXT-215: Prevent decimal numeric entities from wrongly including hex…
Mar 25, 2022
4deb957
TEXT-215: Add unit test for 'semiColonOptional' option in NumericEnti…
Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public int translate(final CharSequence input, final int index, final Writer wri
int end = start;
// Note that this supports character codes without a ; on the end
while (end < seqEnd && (input.charAt(end) >= '0' && input.charAt(end) <= '9'
|| input.charAt(end) >= 'a' && input.charAt(end) <= 'f'
|| input.charAt(end) >= 'A' && input.charAt(end) <= 'F')) {
|| isHex && (input.charAt(end) >= 'a' && input.charAt(end) <= 'f'
|| input.charAt(end) >= 'A' && input.charAt(end) <= 'F'))) {
end++;
}

Expand Down
9 changes: 9 additions & 0 deletions src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,13 @@ public void testCreatesNumericEntityUnescaperTwo() {
assertThat(numericEntityUnescaper.translate("Ws2v8|O=7NR&#cB")).isEqualTo("Ws2v8|O=7NR&#cB");
}

@Test
public void testSemiColonOptional() {
NumericEntityUnescaper neu = new NumericEntityUnescaper(NumericEntityUnescaper.OPTION.semiColonOptional);
assertThat(neu.translate("This is a &#x74;est")).as("Test hexadecimal entity with semi-colon").isEqualTo("This is a test");
assertThat(neu.translate("This is a &#x74est")).as("Test hexadecimal entity without semi-colon").isEqualTo("This is a \u074Est");
assertThat(neu.translate("This is a &#116;est")).as("Test decimal entity with semi-colon").isEqualTo("This is a test");
assertThat(neu.translate("This is a &#116est")).as("Test decimal entity without semi-colon").isEqualTo("This is a test");
}

}