Changeset 204154 in webkit

Timestamp:

Aug 4, 2016, 5:20:48 PM (9 years ago)

Author:

Michael Catanzaro

Message:

[Fontconfig] Segmentation fault in WebCore::FontCache::lastResortFallbackFont
​https://bugs.webkit.org/show_bug.cgi?id=141432

Reviewed by Myles C. Maxfield.

Crash more cleanly when we can't find any last resort fallback font.

• platform/graphics/freetype/FontCacheFreeType.cpp:

(WebCore::FontCache::lastResortFallbackFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/freetype/FontCacheFreeType.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-04  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [Fontconfig] Segmentation fault in WebCore::FontCache::lastResortFallbackFont
+        https://bugs.webkit.org/show_bug.cgi?id=141432
+
+        Reviewed by Myles C. Maxfield.
+
+        Crash more cleanly when we can't find any last resort fallback font.
+
+        * platform/graphics/freetype/FontCacheFreeType.cpp:
+        (WebCore::FontCache::lastResortFallbackFont):
+
 2016-08-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp

@@ -127 +127 @@
     // matches for non-fallback fonts might return 0. See isFallbackFontAllowed.
     static AtomicString timesStr("serif");
-    return *fontForFamily(fontDescription, timesStr);
+    if (RefPtr<Font> font = fontForFamily(fontDescription, timesStr))
+        return *font;
+
+    // This could be reached due to improperly-installed or misconfigured fontconfig.
+    RELEASE_ASSERT_NOT_REACHED();
 }