Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 1760:27d58a02bb9d
6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese)
Reviewed-by: igor, prr
author | srl |
---|---|
date | Mon, 28 Sep 2009 11:52:22 -0700 |
parents | e90f58148115 |
children | e6ced7714609 c74d38ef118c |
files | src/share/native/sun/font/layout/IndicClassTables.cpp test/java/awt/font/TextLayout/TestSinhalaChar.java |
diffstat | 2 files changed, 48 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/font/layout/IndicClassTables.cpp Wed Sep 16 19:36:05 2009 -0700 +++ b/src/share/native/sun/font/layout/IndicClassTables.cpp Mon Sep 28 11:52:22 2009 -0700 @@ -279,7 +279,7 @@ 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/font/TextLayout/TestSinhalaChar.java Mon Sep 28 11:52:22 2009 -0700 @@ -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); + } +} +