7051394: NullPointerException when running regression tests LoadProfileTest by using openjdk-7-b144
Reviewed-by: jgodinez, prr
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Wed Jul 05 18:26:11 2017 +0200
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Oct 23 13:10:52 2012 +0400
@@ -253,6 +253,16 @@
if (sProf.pf == NULL) {
JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+ } else {
+ /* Sanity check: try to save the profile in order
+ * to force basic validation.
+ */
+ cmsUInt32Number pfSize = 0;
+ if (!cmsSaveProfileToMem(sProf.pf, NULL, &pfSize) ||
+ pfSize < sizeof(cmsICCHeader))
+ {
+ JNU_ThrowIllegalArgumentException(env, "Invalid profile data");
+ }
}
return sProf.j;