AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check that the FT_Face actually exists in SkTypeface_FreeType::onGetVariationDesignPosition.

Browse Source 
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>
This commit is contained in:
Ben Wagner 2017-03-02 11:48:38 -05:00 committed by Skia Commit-Bot
parent 4e7fc0c5da
commit e7e5499c78
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ports/SkFontHost_FreeType.cpp
View File

@ -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;
}