infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 17:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

8145551: Test failed with Crash for Improved font lookups

Browse Source 
Reviewed-by: prr, vadim
This commit is contained in:
Alexey Ivanov 2015-12-22 09:50:09 +03:00
parent 2f861a9225
commit 6435c91346
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/java.desktop/share/native/libfontmanager/layout/Features.cpp
View File

@ -43,9 +43,10 @@ LEReferenceTo<FeatureTable> FeatureListTable::getFeatureTable(const LETableRefer
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;

2
jdk/src/java.desktop/share/native/libfontmanager/layout/Lookups.cpp
View File

@ -42,6 +42,7 @@ const LEReferenceTo<LookupTable> LookupListTable::getLookupTable(const LEReferen
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 @@ const LEReferenceTo<LookupSubtable> LookupTable::getLookupSubtable(const LERefer
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)));