Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (255930 => 255931)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:25 UTC (rev 255930)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:28 UTC (rev 255931)
@@ -1,3 +1,15 @@
+2020-02-05 Patrick Griffis <pgrif...@igalia.com>
+
+ [GTK][WPE] Add more fontconfig paths into the sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=207293
+
+ Reviewed by Michael Catanzaro.
+
+ These paths were reported to be used on Debian.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bindFonts):
+
2020-02-05 Chris Dumez <cdu...@apple.com>
[IPC hardening] Protect against bad originIdentifier String in WebPageProxy::reachedApplicationCacheOriginQuota() / requestGeolocationPermissionForFrame()
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (255930 => 255931)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-02-06 15:10:25 UTC (rev 255930)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-02-06 15:10:28 UTC (rev 255931)
@@ -375,6 +375,7 @@
// Configs can include custom dirs but then we have to parse them...
GUniquePtr<char> fontConfig(g_build_filename(configDir, "fontconfig", nullptr));
+ GUniquePtr<char> fontConfigHome(g_build_filename(homeDir, ".fontconfig", nullptr));
GUniquePtr<char> fontCache(g_build_filename(cacheDir, "fontconfig", nullptr));
GUniquePtr<char> fontHomeConfig(g_build_filename(homeDir, ".fonts.conf", nullptr));
GUniquePtr<char> fontHomeConfigDir(g_build_filename(configDir, ".fonts.conf.d", nullptr));
@@ -381,11 +382,13 @@
GUniquePtr<char> fontData(g_build_filename(dataDir, "fonts", nullptr));
GUniquePtr<char> fontHomeData(g_build_filename(homeDir, ".fonts", nullptr));
bindIfExists(args, fontConfig.get());
+ bindIfExists(args, fontConfigHome.get());
bindIfExists(args, fontCache.get(), BindFlags::ReadWrite);
bindIfExists(args, fontHomeConfig.get());
bindIfExists(args, fontHomeConfigDir.get());
bindIfExists(args, fontData.get());
bindIfExists(args, fontHomeData.get());
+ bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian.
}
#if PLATFORM(GTK)
