Skip to content

Replace numeric character references to surrogates with U+FFFD #474

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
simpleqt wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

Replace numeric character references to surrogates with U+FFFD #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion commonmark/src/main/java/org/commonmark/internal/util/Html5Entities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ public static String entityToString(String input) {

try {
int codePoint = Integer.parseInt(value, base);
if (codePoint == 0) {
// The spec says that invalid Unicode code points are replaced by the REPLACEMENT
// CHARACTER. The surrogate range is not a set of valid code points.
if (codePoint == 0
|| (codePoint >= Character.MIN_SURROGATE
&& codePoint <= Character.MAX_SURROGATE)) {
return "\uFFFD";
}
return new String(Character.toChars(codePoint));
Expand Down
13 changes: 13 additions & 0 deletions commonmark/src/test/java/org/commonmark/test/SpecialInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,19 @@ public void nullCharacterEntityShouldBeReplaced() {
assertRendering("foo&#0;bar", "<p>foo\uFFFDbar</p>\n");
}

@Test
public void surrogateCharacterReferenceShouldBeReplaced() {
// The reference is well-formed, but a surrogate is not a valid Unicode code point, so it
// must be replaced by U+FFFD (same as cmark and commonmark.js)
assertRendering("&#xD800;", "<p>\uFFFD</p>\n");
assertRendering("&#55296;", "<p>\uFFFD</p>\n");
assertRendering("&#xDFFF;", "<p>\uFFFD</p>\n");
assertRendering("before&#xD800;after", "<p>before\uFFFDafter</p>\n");
// Code points outside the surrogate range are not affected
assertRendering("&#x1F600;", "<p>\uD83D\uDE00</p>\n");
assertRendering("&#x10FFFF;", "<p>\uDBFF\uDFFF</p>\n");
}

@Test
public void crLfAsLineSeparatorShouldBeParsed() {
assertRendering("foo\r\nbar", "<p>foo\nbar</p>\n");
Expand Down