Mercurial > hg > openjdk > jdk8u > jdk
changeset 11150:b3773a2b6bf6 jdk8u66-b07
Merge
author | asaha |
---|---|
date | Tue, 28 Jul 2015 23:22:37 -0700 |
parents | 97f84f962051 (current diff) f69e9dc04359 (diff) |
children | 1cd8ec29f7f9 |
files | .hgtags |
diffstat | 2 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 28 23:12:54 2015 -0700 +++ b/.hgtags Tue Jul 28 23:22:37 2015 -0700 @@ -462,6 +462,7 @@ 2a5f20c49ad1de765a8c26aab1e13aee8e53b5c6 jdk8u65-b04 fe1c420a8982e58f6d49c50b729732d93f9682dd jdk8u65-b05 3ee40ba7525d6d5ee201a475b967ca2e5c3c9ab3 jdk8u65-b06 +bd2ad7acb217391747dae8263c090483af454313 jdk8u65-b07 e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u66-b00 64d7bd4e98150447916f210e3bfd6875a4c2728a jdk8u66-b01 d8210091911b14930192abd3138ee37c281fb632 jdk8u66-b02
--- a/src/share/native/sun/font/layout/LookupTables.cpp Tue Jul 28 23:12:54 2015 -0700 +++ b/src/share/native/sun/font/layout/LookupTables.cpp Tue Jul 28 23:22:37 2015 -0700 @@ -91,6 +91,10 @@ LEReferenceTo<LookupSingle> entry(base, success, entries); LEReferenceTo<LookupSingle> trial(entry, success, extra); + if (!LE_SUCCESS(success)) { + return NULL; + } + if (SWAPW(trial->glyph) <= ttGlyph) { entry = trial; }