Title: [186432] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 186432
- Author
- [email protected]
- Date
- 2015-07-07 03:20:30 -0700 (Tue, 07 Jul 2015)
Log Message
Merge r185948 - [GTK] Empty gtk-font-name setting causes WebProcess crash rendering pages
https://bugs.webkit.org/show_bug.cgi?id=146246
Reviewed by Sergio Villar Senin.
Return early if system font is empty.
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::updateCachedSystemFontDescription):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186431 => 186432)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 10:13:32 UTC (rev 186431)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 10:20:30 UTC (rev 186432)
@@ -1,3 +1,15 @@
+2015-06-25 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Empty gtk-font-name setting causes WebProcess crash rendering pages
+ https://bugs.webkit.org/show_bug.cgi?id=146246
+
+ Reviewed by Sergio Villar Senin.
+
+ Return early if system font is empty.
+
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::updateCachedSystemFontDescription):
+
2015-06-24 Chris Dumez <[email protected]>
Null dereference in DocumentLoader::areAllLoadersPageCacheAcceptable()
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderThemeGtk.cpp (186431 => 186432)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-07-07 10:13:32 UTC (rev 186431)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-07-07 10:20:30 UTC (rev 186432)
@@ -93,6 +93,8 @@
// This will be a font selection string like "Sans 10" so we cannot use it as the family name.
GUniqueOutPtr<gchar> fontName;
g_object_get(settings, "gtk-font-name", &fontName.outPtr(), nullptr);
+ if (!fontName || !fontName.get()[0])
+ return;
PangoFontDescription* pangoDescription = pango_font_description_from_string(fontName.get());
if (!pangoDescription)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
