jdk-sandbox: comparison jdk/src/share/classes/java/awt/color/ICC

equal deleted inserted replaced

-:89ffcfc5fc26
+:8925b5c1334b
 break;
 case ColorSpace.CS_PYCC:
 synchronized(ICC_Profile.class) {
 if (PYCCprofile == null) {
-if (getProfileFile("PYCC.pf") != null) {
+if (!sun.jkernel.DownloadManager.isJREComplete() ||
+standardProfileExists("PYCC.pf"))
+{
 ProfileDeferralInfo pInfo =
 new ProfileDeferralInfo("PYCC.pf",
 ColorSpace.TYPE_3CLR, 3,
 CLASS_DISPLAY);
 PYCCprofile = getDeferredInstance(pInfo);
 *
 * @exception SecurityException If a security manager is installed
 * and it does not permit read access to the given file.
 */
 public static ICC_Profile getInstance(String fileName) throws IOException {
 ICC_Profile thisProfile;
-FileInputStream fis;
+FileInputStream fis = null;
-SecurityManager security = System.getSecurityManager();
-if (security != null) {
+File f = getProfileFile(fileName);
-security.checkRead(fileName);
+if (f != null) {
-}
+fis = new FileInputStream(f);
+}
-if ((fis = openProfile(fileName)) == null) {
+if (fis == null) {
 throw new IOException("Cannot open file " + fileName);
 }
 thisProfile = getInstance(fis);
 void activateDeferredProfile() throws ProfileDataException {
 byte profileData[];
 FileInputStream fis;
-String fileName = deferralInfo.filename;
+final String fileName = deferralInfo.filename;
 profileActivator = null;
 deferralInfo = null;
-if ((fis = openProfile(fileName)) == null) {
+PrivilegedAction<FileInputStream> pa = new PrivilegedAction<FileInputStream>() {
+public FileInputStream run() {
+File f = getStandardProfileFile(fileName);
+if (f != null) {
+try {
+return new FileInputStream(f);
+} catch (FileNotFoundException e) {}
+}
+return null;
+}
+};
+if ((fis = AccessController.doPrivileged(pa)) == null) {
 throw new ProfileDataException("Cannot open file " + fileName);
 }
 try {
 profileData = getProfileDataFromStream(fis);
 fis.close();    /* close the file */
 * second, relative to any directories specified by the java.class.path
 * property; finally, in a directory used to store profiles always
 * available, such as a profile for sRGB.  Built-in profiles use .pf as
 * the file name extension for profiles, e.g. sRGB.pf.
 */
-private static FileInputStream openProfile(final String fileName) {
+private static File getProfileFile(String fileName) {
-return (FileInputStream)java.security.AccessController.doPrivileged(
-new java.security.PrivilegedAction() {
-public Object run() {
-File f = privilegedGetProfileFile(fileName);
-if (f != null) {
-try {
-return new FileInputStream(f);
-} catch (FileNotFoundException e) {
-}
-}
-return null;
-}
-});
-}
-private static File getProfileFile(final String fileName) {
-return (File)java.security.AccessController.doPrivileged(
-new java.security.PrivilegedAction() {
-public Object run() {
-return privilegedGetProfileFile(fileName);
-}
-});
-}
-/*
-* this version is called from doPrivileged in openProfile
-* or getProfileFile, so the whole method is privileged!
-*/
-private static File privilegedGetProfileFile(String fileName) {
 String path, dir, fullPath;
 File f = new File(fileName); /* try absolute file name */
+if (f.isAbsolute()) {
+/* Rest of code has little sense for an absolute pathname,
+so return here. */
+return f.isFile() ? f : null;
+}
 if ((!f.isFile()) &&
 ((path = System.getProperty("java.iccprofile.path")) != null)){
 /* try relative to java.iccprofile.path */
 StringTokenizer st =
 new StringTokenizer(path, File.pathSeparator);
-while (st.hasMoreTokens() && (!f.isFile())) {
+while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
 dir = st.nextToken();
 fullPath = dir + File.separatorChar + fileName;
 f = new File(fullPath);
+if (!isChildOf(f, dir)) {
+f = null;
+}
 }
 }
-if ((!f.isFile()) &&
+if (((f == null) || (!f.isFile())) &&
 ((path = System.getProperty("java.class.path")) != null)) {
 /* try relative to java.class.path */
 StringTokenizer st =
 new StringTokenizer(path, File.pathSeparator);
-while (st.hasMoreTokens() && (!f.isFile())) {
+while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
 dir = st.nextToken();
 fullPath = dir + File.separatorChar + fileName;
 f = new File(fullPath);
+if (!isChildOf(f, dir)) {
+f = null;
+}
 }
 }
+if ((f == null) || (!f.isFile())) {
-if (!f.isFile()) { /* try the directory of built-in profiles */
+/* try the directory of built-in profiles */
-dir = System.getProperty("java.home") +
+f = getStandardProfileFile(fileName);
-File.separatorChar + "lib" + File.separatorChar + "cmm";
+}
-fullPath = dir + File.separatorChar + fileName;
+if (f != null && f.isFile()) {
-f = new File(fullPath);
+return f;
-if (!f.isFile()) {
+}
-//make sure file was installed in the kernel mode
+return null;
-try {
+}
-//kernel uses platform independent paths =>
-//   should not use platform separator char
+/**
-sun.jkernel.DownloadManager.downloadFile("lib/cmm/"+fileName);
+* Returns a file object corresponding to a built-in profile
-} catch (IOException ioe) {}
+* specified by fileName.
+* If there is no built-in profile with such name, then the method
+* returns null.
+*/
+private static File getStandardProfileFile(String fileName) {
+String dir = System.getProperty("java.home") +
+File.separatorChar + "lib" + File.separatorChar + "cmm";
+String fullPath = dir + File.separatorChar + fileName;
+File f = new File(fullPath);
+if (!f.isFile()) {
+//make sure file was installed in the kernel mode
+try {
+//kernel uses platform independent paths =>
+//   should not use platform separator char
+sun.jkernel.DownloadManager.downloadFile("lib/cmm/"+fileName);
+} catch (IOException ioe) {}
+}
+return (f.isFile() && isChildOf(f, dir)) ? f : null;
+}
+/**
+* Checks whether given file resides inside give directory.
+*/
+private static boolean isChildOf(File f, String dirName) {
+try {
+File dir = new File(dirName);
+String canonicalDirName = dir.getCanonicalPath();
+if (!canonicalDirName.endsWith(File.separator)) {
+canonicalDirName += File.separator;
+}
+String canonicalFileName = f.getCanonicalPath();
+return canonicalFileName.startsWith(canonicalDirName);
+} catch (IOException e) {
+/* we do not expect the IOException here, because invocation
+* of this function is always preceeded by isFile() call.
+*/
+return false;
+}
+}
+/**
+* Checks whether built-in profile specified by fileName exists.
+*/
+private static boolean standardProfileExists(final String fileName) {
+return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+public Boolean run() {
+return getStandardProfileFile(fileName) != null;
 }
-}
+});
-if (f.isFile()) {
-return f;
-}
-return null;
 }
 /*
 * Serialization support.

changeset 4206	8925b5c1334b
parent 3288	db82a42da273
child 4209	e2e5a973b879