/hg/icedtea6: S6795060: VM crash on Linux in ICU layout library ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Aug 5 16:09:44 PDT 2010
changeset ad637c9154cf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ad637c9154cf
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 06 00:09:35 2010 +0100
S6795060: VM crash on Linux in ICU layout library when processing
\u0DDD (Sinhalese)
2010-08-05 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* NEWS: Updated.
* patches/openjdk/6795060-icu_crash.patch: Fixes VM crash on
Linux in ICU layout library when processing \u0DDD
(Sinhalese)
diffstat:
4 files changed, 108 insertions(+), 3 deletions(-)
ChangeLog | 12 +++
Makefile.am | 3
NEWS | 1
patches/openjdk/6795060-icu_crash.patch | 95 +++++++++++++++++++++++++++++++
diffs (146 lines):
diff -r e9de4114620e -r ad637c9154cf ChangeLog
--- a/ChangeLog Thu Aug 05 17:40:41 2010 -0400
+++ b/ChangeLog Fri Aug 06 00:09:35 2010 +0100
@@ -1,9 +1,17 @@ 2010-08-05 Omair Majid <omajid at redhat.
+2010-08-05 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/6795060-icu_crash.patch:
+ Fixes VM crash on Linux in ICU layout library
+ when processing \u0DDD (Sinhalese)
+
2010-08-05 Omair Majid <omajid at redhat.com>
* NEWS: Update with netx bugfix.
* netx/net/sourceforge/jnlp/Launcher.java
- (launchApplication): Replace use of getDeclaredMethod with
- getMethod. Fixes applications that have a main-class that
+ (launchApplication): Replace use of getDeclaredMethod with
+ getMethod. Fixes applications that have a main-class that
inherits main(String[]).
2010-08-05 Andrew John Hughes <ahughes at redhat.com>
diff -r e9de4114620e -r ad637c9154cf Makefile.am
--- a/Makefile.am Thu Aug 05 17:40:41 2010 -0400
+++ b/Makefile.am Fri Aug 06 00:09:35 2010 +0100
@@ -288,7 +288,8 @@ ICEDTEA_PATCHES = \
patches/openjdk/6967533-pre_epoch.patch \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
- patches/ipv4-mapped-ipv6-addresses.patch
+ patches/ipv4-mapped-ipv6-addresses.patch \
+ patches/openjdk/6795060-icu_crash.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r e9de4114620e -r ad637c9154cf NEWS
--- a/NEWS Thu Aug 05 17:40:41 2010 -0400
+++ b/NEWS Fri Aug 06 00:09:35 2010 +0100
@@ -700,6 +700,7 @@ New in release 1.9 (2010-XX-XX):
* Backports:
- S6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds
- S6967533: ExceptionInInitializerError on systems with uninitialized clock
+ - S6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese)
* Fixes:
- Provide font configuration for RHEL 6.
- G266295: Provide font configuration for Gentoo.
diff -r e9de4114620e -r ad637c9154cf patches/openjdk/6795060-icu_crash.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6795060-icu_crash.patch Fri Aug 06 00:09:35 2010 +0100
@@ -0,0 +1,95 @@
+# HG changeset patch
+# User srl
+# Date 1280876869 -3600
+# Node ID 80a618f36d003b3e64fe8dd86f723d980db0d0bc
+# Parent ea703df7276249b3080412d77bf4c3efc1b623a8
+6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese)
+Reviewed-by: igor, prr
+
+diff -r ea703df72762 -r 80a618f36d00 src/share/native/sun/font/layout/IndicClassTables.cpp
+--- openjdk.orig/jdk/src/share/native/sun/font/layout/IndicClassTables.cpp Mon Jul 26 13:05:38 2010 -0700
++++ openjdk/jdk/src/share/native/sun/font/layout/IndicClassTables.cpp Wed Aug 04 00:07:49 2010 +0100
+@@ -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
+diff -r ea703df72762 -r 80a618f36d00 test/java/awt/font/TextLayout/TestSinhalaChar.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java Wed Aug 04 00:07:49 2010 +0100
+@@ -0,0 +1,71 @@
++/*
++ * Copyright (c) 2009, 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 @(#)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);
++ }
++}
++
More information about the distro-pkg-dev
mailing list