diff options
| author |  bungeman <bungeman@google.com> | 2017-05-01 13:02:42 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-01 18:13:02 +0000 |
| commit | 7575bb1c389f96db4123783fcd717f3611b3a8eb (patch) | |
| tree | ba76ce96b732117155b6fc48c644e9e29f50cd85 /src/ports/SkFontMgr_win_dw.cpp | |
| parent | fe560a8cc3839b7c4c0a63bdb286fe1e1f89a5dc (diff) | |
SkFontMgr::matchFamily should not crash on nullptr.
While all systems can resolve a font from just a style request
(without a name) almost no systems specify a default font family.
BUG=skia:6574
Change-Id: If7c81808b62cd5d8212bce2eb4d9c476c45af80a
Reviewed-on: https://skia-review.googlesource.com/14902
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/ports/SkFontMgr_win_dw.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index f985c4f245..1fd300ca1d 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -484,6 +484,10 @@ SkFontStyleSet* SkFontMgr_DirectWrite::onCreateStyleSet(int index) const { } SkFontStyleSet* SkFontMgr_DirectWrite::onMatchFamily(const char familyName[]) const { + if (!familyName) { + return nullptr; + } + SkSMallocWCHAR dwFamilyName; HRN(sk_cstring_to_wchar(familyName, &dwFamilyName)); |