Mercurial > hg > openjdk > jdk8u > jdk

changeset 11384:f3e86cc60726 jdk8u72-b15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 22 Dec 2015 11:18:12 -0800
parents aeaf9f6d18e9 (current diff) 892eb9ab1796 (diff)
children 9a843dc6f959
files .hgtags
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Dec 18 11:51:06 2015 -0800
+++ b/.hgtags	Tue Dec 22 11:18:12 2015 -0800
@@ -511,6 +511,7 @@
 8181f8b6ef0d861f57547c89e52f258cb5583b77 jdk8u71-b12
 23a6e0931277e7d4278605f55db2c81fcb3907b0 jdk8u71-b13
 1ad1d1b46fef8bf88f36b8d0fae6b51df2de7fb2 jdk8u71-b14
+06e7500086a69545a9f55bf5fec23969abe32c57 jdk8u71-b15
 be5faa9c77042f202106c18f4e8ea211137b4a3b jdk8u72-b00
 5ad1e9e8e8417f80c91d7e0f1f44cdf89b34ead3 jdk8u72-b01
 ab0c1040414d038ccbcfcc8ceb1ccf2f44ead8e4 jdk8u72-b02
--- a/src/share/native/sun/font/layout/Features.cpp	Fri Dec 18 11:51:06 2015 -0800
+++ b/src/share/native/sun/font/layout/Features.cpp	Tue Dec 22 11:18:12 2015 -0800
@@ -43,9 +43,10 @@
     LEReferenceToArrayOf<FeatureRecord>
         featureRecordArrayRef(base, success, featureRecordArray, SWAPW(featureCount));
 
-  if (featureIndex >= SWAPW(featureCount) || LE_FAILURE(success)) {
-    return LEReferenceTo<FeatureTable>();
-  }
+    if (featureIndex >= SWAPW(featureCount) || LE_FAILURE(success)) {
+        success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
+        return LEReferenceTo<FeatureTable>();
+    }
 
     Offset featureTableOffset = featureRecordArray[featureIndex].featureTableOffset;
 
--- a/src/share/native/sun/font/layout/Lookups.cpp	Fri Dec 18 11:51:06 2015 -0800
+++ b/src/share/native/sun/font/layout/Lookups.cpp	Tue Dec 22 11:18:12 2015 -0800
@@ -42,6 +42,7 @@
   LEReferenceToArrayOf<Offset> lookupTableOffsetArrayRef(base, success, (const Offset*)&lookupTableOffsetArray, SWAPW(lookupCount));
 
   if(LE_FAILURE(success) || lookupTableIndex>lookupTableOffsetArrayRef.getCount()) {
+    success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
     return LEReferenceTo<LookupTable>();
   } else {
     return LEReferenceTo<LookupTable>(base, success, SWAPW(lookupTableOffsetArrayRef.getObject(lookupTableIndex, success)));
@@ -53,6 +54,7 @@
   LEReferenceToArrayOf<Offset> subTableOffsetArrayRef(base, success, (const Offset*)&subTableOffsetArray, SWAPW(subTableCount));
 
   if(LE_FAILURE(success) || subtableIndex>subTableOffsetArrayRef.getCount()) {
+    success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
     return LEReferenceTo<LookupSubtable>();
   } else {
     return LEReferenceTo<LookupSubtable>(base, success, SWAPW(subTableOffsetArrayRef.getObject(subtableIndex, success)));