changeset 12458:83998ef9e0b9 jdk8u152-b07

Merge
author asaha
date Mon, 10 Jul 2017 15:41:57 -0700
parents 6f46926262c2 f63fd6cea987
children 36a62443b624
files .hgtags src/share/native/sun/java2d/cmm/lcms/cmstypes.c
diffstat 3 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 27 13:57:47 2017 +0100
+++ b/.hgtags	Mon Jul 10 15:41:57 2017 -0700
@@ -713,6 +713,7 @@
 5b0fa6e004312a5910a6a70e4fbc0f00a678e650 jdk8u151-b01
 bd40efd56b4544ff9048d2f7be4cf108b281a6f3 jdk8u151-b02
 58243fea3fe2669e93350bb4b77e188623b85503 jdk8u151-b03
+27273bbb711a402efe5fcd332003ba419102f662 jdk8u151-b04
 1442bc728814af451e2dd1a6719a64485d27e3a0 jdk8u122-b00
 f6030acfa5aec0e64d45adfac69b9e7e5c12bc74 jdk8u122-b01
 6b072c3a6db7ab06804c91aab77431799dfb5d47 jdk8u122-b02
--- a/src/share/native/sun/java2d/cmm/lcms/cmstypes.c	Tue Jun 27 13:57:47 2017 +0100
+++ b/src/share/native/sun/java2d/cmm/lcms/cmstypes.c	Mon Jul 10 15:41:57 2017 -0700
@@ -1489,6 +1489,7 @@
 
         // 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;
--- a/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java	Tue Jun 27 13:57:47 2017 +0100
+++ b/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java	Mon Jul 10 15:41:57 2017 -0700
@@ -48,6 +48,7 @@
 
 /*
  * @test
+ * @bug 8165367
  * @summary Verify the restrictions for certificate path on JSSE with custom trust store.
  * @library /lib/testlibrary
  * @compile JSSEClient.java