/hg/icedtea6: S6785424: SecurityException locating physical font...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue Jun 28 08:32:05 PDT 2011
changeset 411743c2dd64 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=411743c2dd64
author: ptisnovs
date: Tue Jun 28 17:31:50 2011 +0200
S6785424: SecurityException locating physical fonts on Windows
Terminal Server
diffstat:
ChangeLog | 7 +
Makefile.am | 3 +-
NEWS | 1 +
patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch | 95 ++++++++++
4 files changed, 105 insertions(+), 1 deletions(-)
diffs (139 lines):
diff -r 2a3b854d6940 -r 411743c2dd64 ChangeLog
--- a/ChangeLog Tue Jun 28 17:17:59 2011 +0200
+++ b/ChangeLog Tue Jun 28 17:31:50 2011 +0200
@@ -1,3 +1,10 @@
+2011-06-28 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * NEWS: updated with backport
+ * patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch:
+ Backport of 6785424 fix.
+
2011-06-28 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patch
diff -r 2a3b854d6940 -r 411743c2dd64 Makefile.am
--- a/Makefile.am Tue Jun 28 17:17:59 2011 +0200
+++ b/Makefile.am Tue Jun 28 17:31:50 2011 +0200
@@ -368,7 +368,8 @@
patches/openjdk/6699843-IllegalArgumentException_drawString.patch \
patches/openjdk/6918065-Crash_in_Java2D_blit_loop.patch \
patches/openjdk/6623219-Font_canDisplayUpTo_does_not_work.patch \
- patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch
+ patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch \
+ patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 2a3b854d6940 -r 411743c2dd64 NEWS
--- a/NEWS Tue Jun 28 17:17:59 2011 +0200
+++ b/NEWS Tue Jun 28 17:31:50 2011 +0200
@@ -40,6 +40,7 @@
- S6918065: Crash in Java2D blit loop (IntArgbToIntArgbPreSrcOverMaskBlit) in 64bit mode
- S6623219: Font.canDisplayUpTo does not work with supplementary characters
- S6783910: java.awt.Color.brighter()/darker() methods make color opaque
+ - S6785424: SecurityException locating physical fonts on Windows Terminal Server
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
diff -r 2a3b854d6940 -r 411743c2dd64 patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch Tue Jun 28 17:31:50 2011 +0200
@@ -0,0 +1,97 @@
+# HG changeset patch
+# User prr
+# Date 1231278723 28800
+# Node ID eaeaacda1c568a3e013ade338c9b833d767e8591
+# Parent 40ec164889bd9ec1955e36864593bc222474ba43
+6785424: SecurityException locating physical fonts on Windows Terminal Server
+Reviewed-by: campbell, jgodinez
+
+diff -r 40ec164889bd -r eaeaacda1c56 src/share/classes/sun/font/FontManager.java
+--- openjdk.orig/jdk/src/share/classes/sun/font/FontManager.java Wed Dec 24 09:57:48 2008 -0800
++++ openjdk/jdk/src/share/classes/sun/font/FontManager.java Tue Jan 06 13:52:03 2009 -0800
+@@ -1601,18 +1601,27 @@
+ /* Path may be absolute or a base file name relative to one of
+ * the platform font directories
+ */
+- private static String getPathName(String s) {
++ private static String getPathName(final String s) {
+ File f = new File(s);
+ if (f.isAbsolute()) {
+ return s;
+ } else if (pathDirs.length==1) {
+ return pathDirs[0] + File.separator + s;
+ } else {
+- for (int p=0; p<pathDirs.length; p++) {
+- f = new File(pathDirs[p] + File.separator + s);
+- if (f.exists()) {
+- return f.getAbsolutePath();
+- }
++ String path = java.security.AccessController.doPrivileged(
++ new java.security.PrivilegedAction<String>() {
++ public String run() {
++ for (int p=0; p<pathDirs.length; p++) {
++ File f = new File(pathDirs[p] +File.separator+ s);
++ if (f.exists()) {
++ return f.getAbsolutePath();
++ }
++ }
++ return null;
++ }
++ });
++ if (path != null) {
++ return path;
+ }
+ }
+ return s; // shouldn't happen, but harmless
+diff -r 40ec164889bd -r eaeaacda1c56 test/java/awt/FontClass/FontAccess.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/FontClass/FontAccess.java Tue Jan 06 13:52:03 2009 -0800
+@@ -0,0 +1,48 @@
++/*
++ * Copyright (c) 2009 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 6785424
++ * @summary Test no SecurityException searching for a font.
++ * @run main FontAccess
++ *
++ * This can only test the specific bug if run on something like
++ * Windows Citrix Server where SystemDirectory and WindowsDirectory
++ * are different locations.
++ */
++
++import java.awt.*;
++import java.awt.image.*;
++
++public class FontAccess {
++
++ public static void main(String[] args) {
++ System.setSecurityManager(new SecurityManager());
++ Font f = new Font("Verdana", Font.PLAIN, 12);
++ BufferedImage bi = new BufferedImage(1,1,1);
++ Graphics2D g = bi.createGraphics();
++ g.setFont(f);
++ System.out.println(g.getFontMetrics());
++ }
++}
More information about the distro-pkg-dev
mailing list