diff --git a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
index 6a76df32d007b..005ad2cb1eaed 100644
--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1993,20 +1993,18 @@ private String ent(char flag) throws Exception {
try {
int i = Integer.parseInt(
new String(mBuff, idx + 1, mBuffIdx - idx), 10);
- if (i >= 0xffff) {
- panic(FAULT);
+ // Restore the buffer offset
+ mBuffIdx = idx - 1;
+ for(char character : Character.toChars(i)) {
+ if (character == ' ' || mInp.next != null) {
+ bappend(character, flag);
+ } else {
+ bappend(character);
+ }
}
- ch = (char) i;
} catch (NumberFormatException nfe) {
panic(FAULT);
}
- // Restore the buffer offset
- mBuffIdx = idx - 1;
- if (ch == ' ' || mInp.next != null) {
- bappend(ch, flag);
- } else {
- bappend(ch);
- }
st = -1;
break;
@@ -2034,20 +2032,18 @@ private String ent(char flag) throws Exception {
try {
int i = Integer.parseInt(
new String(mBuff, idx + 1, mBuffIdx - idx), 16);
- if (i >= 0xffff) {
- panic(FAULT);
+ // Restore the buffer offset
+ mBuffIdx = idx - 1;
+ for(char character : Character.toChars(i)) {
+ if (character == ' ' || mInp.next != null) {
+ bappend(character, flag);
+ } else {
+ bappend(character);
+ }
}
- ch = (char) i;
} catch (NumberFormatException nfe) {
panic(FAULT);
}
- // Restore the buffer offset
- mBuffIdx = idx - 1;
- if (ch == ' ' || mInp.next != null) {
- bappend(ch, flag);
- } else {
- bappend(ch);
- }
st = -1;
break;
diff --git a/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
index 91a264797d049..d92c238d17426 100644
--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -360,6 +360,15 @@ public void setDoIndent(boolean doIndent) {
_doIndent = doIndent;
}
+ /**
+ * Writes character reference in hex format.
+ */
+ private void writeCharRef(int codePoint) throws XMLStreamException {
+ _writer.write(ENCODING_PREFIX);
+ _writer.write(Integer.toHexString(codePoint));
+ _writer.write(SEMICOLON);
+ }
+
/**
* Writes XML content to underlying writer. Escapes characters unless
* escaping character feature is turned off.
@@ -383,10 +392,15 @@ private void writeXMLContent(char[] content, int start, int length, boolean esca
if (!_writer.canEncode(ch)) {
_writer.write(content, startWritePos, index - startWritePos);
- // Escape this char as underlying encoder cannot handle it
- _writer.write(ENCODING_PREFIX);
- _writer.write(Integer.toHexString(ch));
- _writer.write(SEMICOLON);
+ // Check if current and next characters forms a surrogate pair
+ // and escape it to avoid generation of invalid xml content
+ if ( index != end - 1 && Character.isSurrogatePair(ch, content[index+1])) {
+ writeCharRef(Character.toCodePoint(ch, content[index+1]));
+ index++;
+ } else {
+ writeCharRef(ch);
+ }
+
startWritePos = index + 1;
continue;
}
@@ -455,10 +469,15 @@ private void writeXMLContent(
if (!_writer.canEncode(ch)) {
_writer.write(content, startWritePos, index - startWritePos);
- // Escape this char as underlying encoder cannot handle it
- _writer.write(ENCODING_PREFIX);
- _writer.write(Integer.toHexString(ch));
- _writer.write(SEMICOLON);
+ // Check if current and next characters forms a surrogate pair
+ // and escape it to avoid generation of invalid xml content
+ if ( index != end - 1 && Character.isSurrogatePair(ch, content.charAt(index+1))) {
+ writeCharRef(Character.toCodePoint(ch, content.charAt(index+1)));
+ index++;
+ } else {
+ writeCharRef(ch);
+ }
+
startWritePos = index + 1;
continue;
}
diff --git a/test/jdk/java/util/Properties/LoadAndStoreXML.java b/test/jdk/java/util/Properties/LoadAndStoreXML.java
index 943983a56096b..e374d01a2103d 100644
--- a/test/jdk/java/util/Properties/LoadAndStoreXML.java
+++ b/test/jdk/java/util/Properties/LoadAndStoreXML.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8000354 8000685 8004371 8043119
+ * @bug 8000354 8000685 8004371 8043119 8276207
* @summary Basic test of storeToXML and loadToXML
* @run main/othervm -Djava.security.manager=allow LoadAndStoreXML
*/
@@ -138,6 +138,7 @@ static void testLoadAndStore(String encoding, boolean appendBOM) throws IOExcept
props.put("k3", "\u0020\u0391\u0392\u0393\u0394\u0395\u0396\u0397");
props.put("k4", "\u7532\u9aa8\u6587");
props.put("k5", "<java.home>/conf/jaxp.properties");
+ props.put("k6", "\uD834\uDD1E");
TestOutputStream out = new TestOutputStream();
props.storeToXML(out, null, encoding);
@@ -243,6 +244,31 @@ static void testLoadWithMalformedDoc(Path dir) throws IOException {
}
}
+ /**
+ * Test loadFromXML with supplementary characters
+ */
+ static void testLoadWithSupplementaryCharacters() throws IOException {
+ System.out.println("testLoadWithSupplementaryCharacters");
+
+ Properties expected = new Properties();
+ expected.put("\uD834\uDD1E", "\uD834\uDD1E");
+
+ String s = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\">" +
+ "<properties>" +
+ "<entry key=\"𝄞\">𝄞</entry>" +
+ "</properties>";
+
+ ByteArrayInputStream in = new ByteArrayInputStream(s.getBytes("UTF-8"));
+ Properties props = new Properties();
+ props.loadFromXML(in);
+
+ if (!props.equals(expected)) {
+ System.err.println("loaded: " + props + ", expected: " + expected);
+ throw new RuntimeException("Test failed");
+ }
+ }
+
public static void main(String[] args) throws IOException {
testLoadAndStore("UTF-8", false);
@@ -254,6 +280,7 @@ public static void main(String[] args) throws IOException {
testLoadWithoutEncoding();
testLoadWithBadEncoding();
testStoreWithBadEncoding();
+ testLoadWithSupplementaryCharacters();
// malformed documents
String src = System.getProperty("test.src");