8013430: REGRESSION: closed/java/awt/color/ICC_Profile/LoadProfileTest/LoadProfileTest.java fails with java.io.StreamCorruptedException: invalid type code: EE since 8b87
Reviewed-by: prr, vadim
--- a/jdk/src/share/classes/java/awt/color/ICC_Profile.java Wed Jun 05 09:52:41 2013 -0700
+++ b/jdk/src/share/classes/java/awt/color/ICC_Profile.java Thu Jun 06 13:57:25 2013 +0400
@@ -37,6 +37,7 @@
import sun.java2d.cmm.PCMM;
import sun.java2d.cmm.CMSManager;
+import sun.java2d.cmm.ProfileDataVerifier;
import sun.java2d.cmm.ProfileDeferralMgr;
import sun.java2d.cmm.ProfileDeferralInfo;
import sun.java2d.cmm.ProfileActivator;
@@ -775,6 +776,8 @@
ProfileDeferralMgr.activateProfiles();
}
+ ProfileDataVerifier.verify(data);
+
try {
theID = CMSManager.getModule().loadProfile(data);
} catch (CMMException c) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/java2d/cmm/ProfileDataVerifier.java Thu Jun 06 13:57:25 2013 +0400
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.java2d.cmm;
+
+public class ProfileDataVerifier {
+ /**
+ * Throws an IllegalArgumentException if the data does not correspond
+ * to a valid ICC Profile.
+ *
+ * @param data the specified profile data.
+ */
+ public static void verify(byte[] data) {
+ if (data == null) {
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+
+ if (data.length < TOC_OFFSET) {
+ // not enough data for profile header
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+
+ // check profile size
+ final int size = readInt32(data, 0);
+ final int tagCount = readInt32(data, HEADER_SIZE);
+
+ if (tagCount < 0 || tagCount > MAX_TAG_COUNT) {
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+
+ if (size < (TOC_OFFSET + (tagCount * TOC_RECORD_SIZE)) ||
+ size > data.length)
+ {
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+
+ final int sig = readInt32(data, 36);
+
+ if (PROFILE_FILE_SIGNATURE != sig) {
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+
+ // verify table of content
+ for (int i = 0; i < tagCount; i++) {
+ final int tag_offset = getTagOffset(i, data);
+ final int tag_size = getTagSize(i, data);
+
+ if (tag_offset < TOC_OFFSET || tag_offset > size) {
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+
+ if (tag_size < 0 ||
+ tag_size > (Integer.MAX_VALUE - tag_offset) ||
+ tag_size + tag_offset > size)
+ {
+ throw new IllegalArgumentException("Invalid ICC Profile Data");
+ }
+ }
+ }
+
+ private static int getTagOffset(int idx, byte[] data) {
+ final int pos = TOC_OFFSET + idx * TOC_RECORD_SIZE + 4;
+ return readInt32(data, pos);
+ }
+
+ private static int getTagSize(int idx, byte[] data) {
+ final int pos = TOC_OFFSET + idx * TOC_RECORD_SIZE + 8;
+ return readInt32(data, pos);
+ }
+
+ private static int readInt32(byte[] data, int off) {
+ int res = 0;
+ for (int i = 0; i < 4; i++) {
+ res = res << 8;
+
+ res |= (0xff & data[off++]);
+ }
+ return res;
+ }
+
+ /**
+ * Lcms limit for the number of tags: 100
+ * Kcms limit for the number of tags: N/A
+ */
+ private static final int MAX_TAG_COUNT = 100;
+
+ private static final int HEADER_SIZE = 128;
+ private static final int TOC_OFFSET = HEADER_SIZE + 4;
+ private static final int TOC_RECORD_SIZE = 12;
+
+ private static final int PROFILE_FILE_SIGNATURE = 0x61637370;
+}