commit 98b82dd9c5e1e4a658ace6e1907c4add37961ed3
author Ben Wagner <bungeman@google.com> Thu Mar 02 11:48:38 2017 -0500
committer bungeman <bungeman@google.com> Tue Mar 28 10:33:13 2017 -0400
tree 4518e4d6e57a35c79dcf8f96aeebb094eb8195fc
parent be2b172886a73ce5bbdc41b4cdc57b36e246618c

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>

Cherry-pick: e7e5499c787a492d98f73445dea78b9dfb0f773b
Approval: https://crbug.com/705429#c5

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index c7bc07a..1c228ea 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1581,7 +1581,7 @@
     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;
     }