diff --git a/.hgtags b/.hgtags index 0cf9ebd5b5026031f7a3d98f1bbc9fea6eeea1c8..93765374b663f1c84d5e307ea164959cb535c546 100644 --- a/.hgtags +++ b/.hgtags @@ -713,6 +713,7 @@ d630e23b8e36c2863225d7ae107c73a38d3e6102 jdk8u141-b14 5b0fa6e004312a5910a6a70e4fbc0f00a678e650 jdk8u151-b01 bd40efd56b4544ff9048d2f7be4cf108b281a6f3 jdk8u151-b02 58243fea3fe2669e93350bb4b77e188623b85503 jdk8u151-b03 +27273bbb711a402efe5fcd332003ba419102f662 jdk8u151-b04 1442bc728814af451e2dd1a6719a64485d27e3a0 jdk8u122-b00 f6030acfa5aec0e64d45adfac69b9e7e5c12bc74 jdk8u122-b01 6b072c3a6db7ab06804c91aab77431799dfb5d47 jdk8u122-b02 diff --git a/src/share/native/sun/java2d/cmm/lcms/cmstypes.c b/src/share/native/sun/java2d/cmm/lcms/cmstypes.c index 61ea3a631e5cbd294773cff9350a13a65b7cc4d1..95fe4d1a5a694094e6b6bb06196e88451a7e104f 100644 --- a/src/share/native/sun/java2d/cmm/lcms/cmstypes.c +++ b/src/share/native/sun/java2d/cmm/lcms/cmstypes.c @@ -1489,6 +1489,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU // Check for overflow if (Offset < (SizeOfHeader + 8)) goto Error; + if (((Offset + Len) < Len) || ((Offset + Len) > SizeOfTag + 8)) goto Error; // True begin of the string BeginOfThisString = Offset - SizeOfHeader - 8; diff --git a/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java b/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java index f23a0a4ee5705986a726d96b6f504f1407a44932..55d9b451fe1933803d69211e71f9261f7ad39f3a 100644 --- a/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java +++ b/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java @@ -48,6 +48,7 @@ import jdk.testlibrary.ProcessTools; /* * @test + * @bug 8165367 * @summary Verify the restrictions for certificate path on JSSE with custom trust store. * @library /lib/testlibrary * @compile JSSEClient.java