diff options
| -rw-r--r-- | src/core/SkFontHost.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp index ab32dfc6b2..c09739d02f 100644 --- a/src/core/SkFontHost.cpp +++ b/src/core/SkFontHost.cpp @@ -193,6 +193,10 @@ SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[], void set_up_default(SkFontMgr** singleton) { *singleton = SkFontMgr::Factory(); + // we never want to return NULL + if (NULL == *singleton) { + *singleton = SkNEW(SkEmptyFontMgr); + } } SkFontMgr* SkFontMgr::RefDefault() { |