From a9b426bfb3dd7ddd332c64d3db73ce7a53ecb984 Mon Sep 17 00:00:00 2001 From: prr Date: Thu, 18 Dec 2014 11:19:07 -0800 Subject: [PATCH] 8065291: Improved font lookups Reviewed-by: bae, srl, mschoene --- src/share/native/sun/font/layout/LookupProcessor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/share/native/sun/font/layout/LookupProcessor.cpp b/src/share/native/sun/font/layout/LookupProcessor.cpp index b5d750d9a..0629e9d6d 100644 --- a/src/share/native/sun/font/layout/LookupProcessor.cpp +++ b/src/share/native/sun/font/layout/LookupProcessor.cpp @@ -255,6 +255,7 @@ LookupProcessor::LookupProcessor(const LETableReference &baseAddress, if (requiredFeatureIndex != 0xFFFF) { requiredFeatureTable = featureListTable->getFeatureTable(featureListTable, requiredFeatureIndex, &requiredFeatureTag, success); + if (LE_FAILURE(success)) return; featureReferences += SWAPW(requiredFeatureTable->lookupCount); } @@ -292,7 +293,7 @@ LookupProcessor::LookupProcessor(const LETableReference &baseAddress, } featureTable = featureListTable->getFeatureTable(featureListTable, featureIndex, &featureTag, success); - + if (LE_FAILURE(success)) continue; if (featureTag == fm.tag) { count += selectLookups(featureTable, fm.mask, order + count, success); } @@ -319,7 +320,7 @@ LookupProcessor::LookupProcessor(const LETableReference &baseAddress, #endif featureTable = featureListTable->getFeatureTable(featureListTable, featureIndex, &featureTag, success); - + if (LE_FAILURE(success)) continue; if (featureTag == fm.tag) { order += selectLookups(featureTable, fm.mask, order, success); } -- GitLab