Skip to content
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

CLDR-17847 Fix NPE in CodePointEscaper #3918

Merged
merged 1 commit into from
Jul 30, 2024
Merged

CLDR-17847 Fix NPE in CodePointEscaper #3918

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
3 changes: 2 additions & 1 deletion tools/cldr-code/src/main/java/org/unicode/cldr/util/CodePointEscaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,10 @@ public static String toUnescaped(String escaped) {
public static String toExample(int codePoint) {
CodePointEscaper cpe = _fromCodePoint.get(codePoint);
if (cpe == null) { // hex
final String name = UCharacter.getExtendedName(codePoint);
return codePointToEscaped(codePoint)
+ HAS_NAME
+ UCharacter.getName(codePoint).toLowerCase();
+ (name != null ? name.toLowerCase() : "");
} else {
return CodePointEscaper.codePointToEscaped(cpe.codePoint)
+ HAS_NAME
Expand Down
15 changes: 15 additions & 0 deletions tools/cldr-code/src/test/java/org/unicode/cldr/unittest/UnicodeSetPrettyPrinterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,4 +439,19 @@ public void TestStringEscaper() {
assertEquals(expected, expectedRoundtrip, actualRoundtrip);
}
}

public void test17847() {
String path =
"//ldml/characters/parseLenients[@scope=\"general\"][@level=\"lenient\"]/parseLenient[@sample=\"$\"]";
String value = "[\\$＄﹩ \\uFFFF]";
UnicodeSet valueSet = new UnicodeSet(value).freeze();
UnicodeSet examples = new UnicodeSet();

// throws exception
if (valueSet.containsSome(CodePointEscaper.FORCE_ESCAPE)) {
for (String nsm : new UnicodeSet(valueSet).retainAll(CodePointEscaper.FORCE_ESCAPE)) {
assertNotNull(Utility.hex(nsm), CodePointEscaper.toExample(nsm.codePointAt(0)));
}
}
}
}
Loading