--- old/src/share/classes/javax/swing/text/html/parser/Parser.java 2012-06-27 21:36:56.559663308 +0400
+++ new/src/share/classes/javax/swing/text/html/parser/Parser.java 2012-06-27 21:36:52.888493311 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, 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
@@ -80,6 +80,9 @@
public
class Parser implements DTDConstants {
+ // Maximum codepoint value within BMP
+ private static final int MAX_BMP_BOUND = 65535;
+
private char text[] = new char[1024];
private int textpos = 0;
private TagElement last;
@@ -952,8 +955,22 @@
ch = readCh();
break;
}
- char data[] = {mapNumericReference((char) n)};
- return data;
+ // Check if n codepoint is within BMP; convert into surrogate
+ // pair otherwise
+ try {
+ char data[];
+ if (n <= MAX_BMP_BOUND) {
+ data = Character.toChars(mapNumericReference((char) n));
+ } else {
+ data = Character.toChars(n);
+ }
+
+ return data;
+ }
+ catch(IllegalArgumentException ex) {
+ error(ex.toString());
+ return new char[0];
+ }
}
addString('#');
if (!parseIdentifier(false)) {
--- /dev/null 2012-06-27 21:37:09.000000000 +0400
+++ new/test/javax/swing/text/html/parser/Parser/6836089/Test6836089.java 2012-06-27 21:37:05.276214716 +0400
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6836089
+ * @summary Tests correct parsing of characters outside Base Multilingual Plane
+ * @author Vladislav Karnaukhov
+ */
+
+import javax.swing.*;
+import javax.swing.text.html.*;
+
+public class Test6836089 {
+
+ public static void main(String[] args) throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ JTextPane htmlPane = new JTextPane();
+ htmlPane.setEditorKit(new HTMLEditorKit());
+
+ htmlPane.setText("𠀀");
+ String str = htmlPane.getText();
+ if (str.contains("�")) {
+ throw new RuntimeException("Test failed");
+ }
+ }
+ });
+ }
+}