Mercurial > hg > openjdk > aarch64-port > jdk
changeset 8001:b5c5cff52455
Merge
author | lana |
---|---|
date | Wed, 28 Aug 2013 08:59:50 -0700 |
parents | 9626ba160e3d (current diff) 12ac08d79c9b (diff) |
children | 7da90f645a63 |
files | |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/font/layout/SunLayoutEngine.cpp Fri Aug 23 14:14:05 2013 -0700 +++ b/src/share/native/sun/font/layout/SunLayoutEngine.cpp Wed Aug 28 08:59:50 2013 -0700 @@ -179,6 +179,10 @@ FontInstanceAdapter fia(env, font2d, strike, mat, 72, 72, (le_int32) upem, (TTLayoutTableCache *) layoutTables); LEErrorCode success = LE_NO_ERROR; LayoutEngine *engine = LayoutEngine::layoutEngineFactory(&fia, script, lang, typo_flags & TYPO_MASK, success); + if (engine == NULL) { + env->SetIntField(gvdata, gvdCountFID, -1); // flag failure + return; + } if (min < 0) min = 0; if (max < min) max = min; /* defensive coding */ // have to copy, yuck, since code does upcalls now. this will be soooo slow