--- old/src/share/classes/sun/font/FontUtilities.java 2010-02-03 20:27:59.393236400 +0100 +++ new/src/share/classes/sun/font/FontUtilities.java 2010-02-03 20:27:59.213259060 +0100 @@ -32,9 +32,9 @@ import java.io.InputStreamReader; import java.security.AccessController; +import java.security.PrivilegedAction; import javax.swing.plaf.FontUIResource; -import sun.security.action.GetPropertyAction; import sun.util.logging.PlatformLogger; /** @@ -42,79 +42,82 @@ */ public final class FontUtilities { - public static final boolean isSolaris; + public static boolean isSolaris; - public static final boolean isLinux; + public static boolean isLinux; - public static final boolean isSolaris8; + public static boolean isSolaris8; - public static final boolean isSolaris9; + public static boolean isSolaris9; - public static final boolean isOpenSolaris; + public static boolean isOpenSolaris; - public static final boolean useT2K; + public static boolean useT2K; - public static final boolean isWindows; + public static boolean isWindows; - public static final boolean isOpenJDK; + public static boolean isOpenJDK; static final String LUCIDA_FILE_NAME = "LucidaSansRegular.ttf"; // This static initializer block figures out the OS constants. static { - String osName = AccessController.doPrivileged( - new GetPropertyAction("os.name", "unknownOS")); - isSolaris = osName.startsWith("SunOS"); - - isLinux = osName.startsWith("Linux"); - - String t2kStr = AccessController.doPrivileged( - new GetPropertyAction("sun.java2d.font.scaler")); - if (t2kStr != null) { - useT2K = "t2k".equals(t2kStr); - } else { - useT2K = false; - } - if (isSolaris) { - String version = AccessController.doPrivileged( - new GetPropertyAction("os.version", "0.0")); - isSolaris8 = version.startsWith("5.8"); - isSolaris9 = version.startsWith("5.9"); - float ver = Float.parseFloat(version); - if (ver > 5.10f) { - File f = new File("/etc/release"); - String line = null; - try { - FileInputStream fis = new FileInputStream(f); - InputStreamReader isr = new InputStreamReader( - fis, "ISO-8859-1"); - BufferedReader br = new BufferedReader(isr); - line = br.readLine(); - fis.close(); - } catch (Exception ex) { - // Nothing to do here. + AccessController.doPrivileged(new PrivilegedAction () { + public Object run() { + String osName = System.getProperty("os.name", "unknownOS"); + isSolaris = osName.startsWith("SunOS"); + + isLinux = osName.startsWith("Linux"); + + String t2kStr = System.getProperty("sun.java2d.font.scaler"); + if (t2kStr != null) { + useT2K = "t2k".equals(t2kStr); + } else { + useT2K = false; } - if (line != null && line.indexOf("OpenSolaris") >= 0) { - isOpenSolaris = true; + if (isSolaris) { + String version = System.getProperty("os.version", "0.0"); + isSolaris8 = version.startsWith("5.8"); + isSolaris9 = version.startsWith("5.9"); + float ver = Float.parseFloat(version); + if (ver > 5.10f) { + File f = new File("/etc/release"); + String line = null; + try { + FileInputStream fis = new FileInputStream(f); + InputStreamReader isr = new InputStreamReader( + fis, "ISO-8859-1"); + BufferedReader br = new BufferedReader(isr); + line = br.readLine(); + fis.close(); + } catch (Exception ex) { + // Nothing to do here. + } + if (line != null && line.indexOf("OpenSolaris") >= 0) { + isOpenSolaris = true; + } else { + isOpenSolaris = false; + } + } else { + isOpenSolaris = false; + } } else { + isSolaris8 = false; + isSolaris9 = false; isOpenSolaris = false; } - } else { - isOpenSolaris= false; + isWindows = osName.startsWith("Windows"); + String jreLibDirName = System.getProperty("java.home", "") + + File.separator + "lib"; + String jreFontDirName = + jreLibDirName + File.separator + "fonts"; + File lucidaFile = new File(jreFontDirName + File.separator + + LUCIDA_FILE_NAME); + isOpenJDK = !lucidaFile.exists(); + return null; } - } else { - isSolaris8 = false; - isSolaris9 = false; - isOpenSolaris = false; - } - isWindows = osName.startsWith("Windows"); - String jreLibDirName = AccessController.doPrivileged( - new GetPropertyAction("java.home","")) + File.separator + "lib"; - String jreFontDirName = jreLibDirName + File.separator + "fonts"; - File lucidaFile = - new File(jreFontDirName + File.separator + LUCIDA_FILE_NAME); - isOpenJDK = !lucidaFile.exists(); + }); } /** --- /dev/null 2010-02-03 08:44:29.060758293 +0100 +++ new/test/java/awt/FontClass/FontPrivilege.java 2010-02-03 20:27:59.873237909 +0100 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 5010310 6319835 6904882 + * @summary test fonts can be created in the presence of a security manager + * @run main/othervm/secure=java.lang.SecurityManager FontPrivilege + */ + +import java.awt.Font; + +public class FontPrivilege { + + public static void main(String[] args) throws Exception { + new Font("Helvetica", Font.PLAIN, 12).getFamily(); + new Font("foo bar", Font.PLAIN, 12).getFamily(); + } +}