From 082dc901f632f5d6a63bd26906735c8329837196 Mon Sep 17 00:00:00 2001
From: srl <none@none>
Date: Mon, 28 Sep 2009 11:52:22 -0700
Subject: 6795060: VM crash on Linux in ICU layout library when processing
 \u0DDD (Sinhalese) Reviewed-by: igor, prr

---
 .../native/sun/font/layout/IndicClassTables.cpp    |  2 +-
 test/java/awt/font/TextLayout/TestSinhalaChar.java | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 test/java/awt/font/TextLayout/TestSinhalaChar.java

diff --git a/src/share/native/sun/font/layout/IndicClassTables.cpp b/src/share/native/sun/font/layout/IndicClassTables.cpp
index d606b255d..5d24a2711 100644
--- a/src/share/native/sun/font/layout/IndicClassTables.cpp
+++ b/src/share/native/sun/font/layout/IndicClassTables.cpp
@@ -279,7 +279,7 @@ static const IndicClassTable kndaClassTable = {0x0C80, 0x0CEF, 4, KNDA_SCRIPT_FL
 
 static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
 
-static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 3, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
+static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
 
 //
 // IndicClassTable addresses
diff --git a/test/java/awt/font/TextLayout/TestSinhalaChar.java b/test/java/awt/font/TextLayout/TestSinhalaChar.java
new file mode 100644
index 000000000..41e773490
--- /dev/null
+++ b/test/java/awt/font/TextLayout/TestSinhalaChar.java
@@ -0,0 +1,47 @@
+/* @test @(#)TestSinhalaChar.java
+ * @summary verify lack of crash on U+0DDD.
+ * @bug 6795060
+ */
+
+import javax.swing.*;
+import javax.swing.border.LineBorder;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+
+public class TestSinhalaChar {
+    public static void main(String[] args) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                new TestSinhalaChar().run();
+            }
+        });
+    }
+    public static boolean AUTOMATIC_TEST=true;  // true; run test automatically, else manually at button push
+
+    private void run() {
+        JFrame frame = new JFrame("Test Character (no crash = PASS)");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JPanel panel = new JPanel();
+        final JLabel label = new JLabel("(empty)");
+        label.setSize(400, 100);
+        label.setBorder(new LineBorder(Color.black));
+        label.setFont(new Font("Lucida Bright", Font.PLAIN, 12));
+        if(AUTOMATIC_TEST) {  /* run the test automatically (else, manually) */
+           label.setText(Character.toString('\u0DDD'));
+        } else {
+        JButton button = new JButton("Set Char x0DDD");
+        button.addActionListener(new AbstractAction() {
+            public void actionPerformed(ActionEvent actionEvent) {
+           label.setText(Character.toString('\u0DDD'));
+            }
+        });
+        panel.add(button);
+        }
+        panel.add(label);
+
+        frame.getContentPane().add(panel);
+        frame.pack();
+        frame.setVisible(true);
+    }
+}
+
-- 
cgit v1.2.3