diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-03-02 11:48:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-02 17:32:13 +0000 |
| commit | e7e5499c787a492d98f73445dea78b9dfb0f773b (patch) | |
| tree | aad36b67cc6b44d517ac9d3c24817555f368859f /src/ports | |
| parent | 4e7fc0c5da88e0e4ccc1dff23f4f2ff134130acd (diff) | |
Check that the FT_Face actually exists in SkTypeface_FreeType::onGetVariationDesignPosition.
All users of AutoFTAccess check the FT_Face for nullptr in case the
FT_Face cannot actually be created. This check was overlooked in the
recent addition of SkTypeface_FreeType::onGetVariationDesignPosition.
BUG=chromium:697878
Change-Id: I92dfe845f2aecfa00bd4d088ac139f74c019c03d
Reviewed-on: https://skia-review.googlesource.com/9151
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index c7bc07aa4b..1c228eaf48 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -1581,7 +1581,7 @@ int SkTypeface_FreeType::onGetVariationDesignPosition( AutoFTAccess fta(this); FT_Face face = fta.face(); - if (!(face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) { + if (!face || !(face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) { return 0; } |