aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tarasov <anton.tarasov@jetbrains.com>2017-07-18 18:45:09 +0300
committerAnton Tarasov <anton.tarasov@jetbrains.com>2017-07-18 19:13:58 +0300
commit381f268bae8f5a8339bf7ea5143846e64e3130d9 (patch)
tree2e35c7a639f79fe42c05995de088e6cc68e47e48
parent5ac8dbe0cb920224e2a4ba5b9740c7a6ed2b99b6 (diff)
downloadjdk8u_jdk-jb8u152-b915.7.tar.gz
RIDER-7875 Crash after launching Rider for a few secondsjb8u152-b915.7
review: JR-CR-178 (cherry picked from commit 974e625)
-rw-r--r--src/macosx/native/sun/font/CGGlyphImages.m1
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;