Attachment 340313 Details for Bug 185611 – [GTK][WPE]: Avoid trying to getenv with an unset varname

[patch] [GTK][WPE]: Avoid trying to getenv with an unset varname

GTKWPE-Avoid-trying-to-getenv-with-an-unset-varnam.patch (text/plain), 2.27 KB, created by Thibault Saunier on 2018-05-14 07:27:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Saunier

Created: 2018-05-14 07:27:34 PDT

Size: 2.27 KB

patch

obsolete

>From fba900f8fbf86dcec9f5e3c0878b35adefe90c9e Mon Sep 17 00:00:00 2001
>From: Thibault Saunier <tsaunier@igalia.com>
>Date: Mon, 14 May 2018 10:18:02 -0400
>Subject: [PATCH xserver] [GTK][WPE]: Avoid trying to getenv with an unset
> varname
>
>Otherwise we might get segfault
>
>https://bugs.webkit.org/show_bug.cgi?id=185611
>---
> Source/WebKit/ChangeLog                       | 14 ++++++++++++++
> Source/WebKit/UIProcess/ChildProcessProxy.cpp |  4 +++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 03d53386e60..b5ce2f76333 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-14  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GTK][WPE]: Avoid trying to getenv with an unset varname
>+        https://bugs.webkit.org/show_bug.cgi?id=185611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Otherwise we might segfault
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=185611
>+
>+        * UIProcess/ChildProcessProxy.cpp:
>+        (WebKit::ChildProcessProxy::getLaunchOptions):
>+
> 2018-05-14  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [GTK] REGRESSION(r231170) Build broken with Clang 5.0
>diff --git a/Source/WebKit/UIProcess/ChildProcessProxy.cpp b/Source/WebKit/UIProcess/ChildProcessProxy.cpp
>index 96511fdc04a..79d2f5bf9e1 100644
>--- a/Source/WebKit/UIProcess/ChildProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/ChildProcessProxy.cpp
>@@ -58,7 +58,7 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
>         launchOptions.extraInitializationData.add(ASCIILiteral("always-runs-at-background-priority"), "true");
> 
> #if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(WPE))
>-    const char* varname;
>+    const char* varname = nullptr;
>     switch (launchOptions.processType) {
>     case ProcessLauncher::ProcessType::Web:
>         varname = "WEB_PROCESS_CMD_PREFIX";
>@@ -76,6 +76,8 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
>         varname = "STORAGE_PROCESS_CMD_PREFIX";
>         break;
>     }
>+    if (!varname)
>+        return;
>     const char* processCmdPrefix = getenv(varname);
>     if (processCmdPrefix && *processCmdPrefix)
>         launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
>-- 
>2.17.0

Flags:

mcatanzaro: review-
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185611: 340313 | 340321 | 340429 | 340488 | 341270 | 341289 | 342812