commit 04b5451c69f535017109bba8594ce7111c4da2a7
author Russell Brenner <russellbrenner@google.com> Thu Jul 07 10:05:05 2011 -0700
committer Russell Brenner <russellbrenner@google.com> Thu Jul 07 10:05:05 2011 -0700
tree df6b7813d1cbba794e23b1c8fc304b7557ff14eb
parent 792a256ab723bbc4b55ba00194fe2a9195cae8c0

Restored null-check in SkFontHost::NextLogicalFont

This updated line was to have been included in CL 118811, but some
bad gerrit-fu caused it to go amiss.

Bug: 4390209
Change-Id: Ia7b8e2849cfae3cdfbebc09a91fe26f2355f1ebb

src/ports/SkFontHost_android.cpp

diff --git a/src/ports/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp
index 49b5bd4..4266925 100644
--- a/src/ports/SkFontHost_android.cpp
+++ b/src/ports/SkFontHost_android.cpp
@@ -643,7 +643,7 @@
      */
 
     SkTypeface* origTypeface = find_from_uniqueID(origFontID);
-    SkTypeface::Style origStyle = origTypeface->style();
+    SkTypeface::Style origStyle = origTypeface ? origTypeface->style() : SkTypeface::kNormal;
 
     FamilyRec* family = gFallbackHead;
     while (family) {