Changeset 259044 in webkit

Timestamp:

Mar 26, 2020 8:22:42 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Crash in WebKit::LayerTreeHost::LayerTreeHost with bubblewrap sandbox enabled
​https://bugs.webkit.org/show_bug.cgi?id=209106

Patch by Michael Catanzaro <Michael Catanzaro> on 2020-03-26
Reviewed by Carlos Garcia Campos.

Don't bind the WaylandCompositor socket unless we're running under Wayland and it's actually
started successfully.

• UIProcess/Launcher/glib/BubblewrapLauncher.cpp:

(WebKit::bindWayland):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/glib/BubblewrapLauncher.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-26  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        [GTK] Crash in WebKit::LayerTreeHost::LayerTreeHost with bubblewrap sandbox enabled
+        https://bugs.webkit.org/show_bug.cgi?id=209106
+
+        Reviewed by Carlos Garcia Campos.
+
+        Don't bind the WaylandCompositor socket unless we're running under Wayland and it's actually
+        started successfully.
+
+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+        (WebKit::bindWayland):
+
 2020-03-26  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

@@ -328 +328 @@
 static void bindWayland(Vector<CString>& args)
 {
+    if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::Wayland)
+        return;
+
     const char* display = g_getenv("WAYLAND_DISPLAY");
     if (!display)
@@ -336 +339 @@
     bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
 
-#if PLATFORM(GTK) && !USE(WPE_RENDERER)
-    String displayName = WaylandCompositor::singleton().displayName();
-    waylandRuntimeFile.reset(g_build_filename(runtimeDir, displayName.utf8().data(), nullptr));
-    bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
+#if !USE(WPE_RENDERER)
+    if (WaylandCompositor::singleton().isRunning()) {
+        String displayName = WaylandCompositor::singleton().displayName();
+        waylandRuntimeFile.reset(g_build_filename(runtimeDir, displayName.utf8().data(), nullptr));
+        bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
+    }
 #endif
 }