diff options
| author | Anton Tarasov <anton.tarasov@jetbrains.com> | 2017-07-18 18:45:09 +0300 |
|---|---|---|
| committer | Anton Tarasov <anton.tarasov@jetbrains.com> | 2017-07-18 19:12:17 +0300 |
| commit | aafe59fcc347f58a6e5d17a8f5912a25fab2617b (patch) | |
| tree | 83d954fcd2008f6d1db5c5b5706c684f99251f8d | |
| parent | 23b56678f8374e27152e9c375f3e158960c7d54a (diff) | |
| download | jdk8u_jdk-jb8u112-b736.22.tar.gz | |
RIDER-7875 Crash after launching Rider for a few secondsjb8u112-b736.22
review: JR-CR-178
(cherry picked from commit 974e625)
| -rw-r--r-- | src/macosx/native/sun/font/CGGlyphImages.m | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/macosx/native/sun/font/CGGlyphImages.m b/src/macosx/native/sun/font/CGGlyphImages.m index dfee153966..48027c498b 100644 --- a/src/macosx/native/sun/font/CGGlyphImages.m +++ b/src/macosx/native/sun/font/CGGlyphImages.m @@ -367,6 +367,7 @@ static CFStringRef EMOJI_FONT_NAME = CFSTR("Apple Color Emoji"); bool CGGI_IsColorFont(CGFontRef font) { CFStringRef name = CGFontCopyFullName(font); + if (name == NULL) return false; bool isFixedColor = CFStringCompare(name, EMOJI_FONT_NAME, 0) == kCFCompareEqualTo; CFRelease(name); return isFixedColor; |