Changeset 249487 in webkit

Timestamp:

Sep 4, 2019 11:13:02 AM (5 years ago)

Author:

Patrick Griffis

Message:

[WPE][GTK] Fix sandbox parsing DISPLAY on X11
​https://bugs.webkit.org/show_bug.cgi?id=201462

Reviewed by Michael Catanzaro.

On some setups the DISPLAY env var was incorrectly parsed.

• UIProcess/Launcher/glib/BubblewrapLauncher.cpp:

(WebKit::bindX11):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-04  Patrick Griffis  <pgriffis@igalia.com>
+
+        [WPE][GTK] Fix sandbox parsing DISPLAY on X11
+        https://bugs.webkit.org/show_bug.cgi?id=201462
+
+        Reviewed by Michael Catanzaro.
+
+        On some setups the DISPLAY env var was incorrectly parsed.
+
+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+        (WebKit::bindX11):
+
 2019-09-04  Brian Burg  <bburg@apple.com>
 

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

@@ -295 +295 @@
 {
     const char* display = g_getenv("DISPLAY");
-    if (!display || display[0] != ':' || !g_ascii_isdigit(const_cast<char*>(display)[1]))
-        display = ":0";
-    GUniquePtr<char> x11File(g_strdup_printf("/tmp/.X11-unix/X%s", display + 1));
-    bindIfExists(args, x11File.get(), BindFlags::ReadWrite);
+    if (display && display[0] == ':' && g_ascii_isdigit(const_cast<char*>(display)[1])) {
+        const char* displayNumber = &display[1];
+        const char* displayNumberEnd = displayNumber;
+        while (g_ascii_isdigit(*displayNumberEnd))
+            displayNumberEnd++;
+
+        GUniquePtr<char> displayString(g_strndup(displayNumber, displayNumberEnd - displayNumber));
+        GUniquePtr<char> x11File(g_strdup_printf("/tmp/.X11-unix/X%s", displayString.get()));
+        bindIfExists(args, x11File.get(), BindFlags::ReadWrite);
+    }
 
     const char* xauth = g_getenv("XAUTHORITY");