commit 256b351fb1d33f3e3156d090a6a533b54ad66117
author bungeman <bungeman@google.com> Wed Jul 02 07:57:59 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 02 07:57:59 2014 -0700
tree 44b85e8d2b2fbf799799988704d5c59bbdb18f31
parent bce3d6dbb91c3e67f1010556c2b8aaf6d7a49267

CTFontCopy*Name may return NULL.

BUG=skia:2708
R=caryclark@google.com, reed@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/365683004

src/ports/SkFontHost_mac.cpp

diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 77bf4b8..06e6fac 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -1520,7 +1520,7 @@
     return true;
 }
 
-// we might move this into our CGUtils...
+/** Assumes src and dst are not NULL. */
 static void CFStringToSkString(CFStringRef src, SkString* dst) {
     // Reserve enough room for the worst-case string,
     // plus 1 byte for the trailing null.
@@ -1544,7 +1544,9 @@
 
     {
         AutoCFRelease<CFStringRef> fontName(CTFontCopyPostScriptName(ctFont));
-        CFStringToSkString(fontName, &info->fFontName);
+        if (fontName.get()) {
+            CFStringToSkString(fontName, &info->fFontName);
+        }
     }
 
     CFIndex glyphCount = CTFontGetGlyphCount(ctFont);
@@ -1899,6 +1901,9 @@
 
 // we take ownership of the ref
 static const char* get_str(CFStringRef ref, SkString* str) {
+    if (NULL == ref) {
+        return NULL;
+    }
     CFStringToSkString(ref, str);
     CFSafeRelease(ref);
     return str->c_str();