Attachment 340488 Details for Bug 185611 – Address comments

[patch] Address comments

GTKWPE-Avoid-using-uninitialized-launchOptions-in-.patch (text/plain), 2.60 KB, created by Thibault Saunier on 2018-05-16 06:27:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Saunier

Created: 2018-05-16 06:27:51 PDT

Size: 2.60 KB

patch

obsolete

>From 2ed3d5160381113c14dba013acd5292aa295c509 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 using uninitialized launchOptions
> in getLaunchOptions
>
>Otherwise we might get segfault
>
>https://bugs.webkit.org/show_bug.cgi?id=185611
>---
> Source/WebKit/ChangeLog                            | 14 ++++++++++++++
> Source/WebKit/UIProcess/ChildProcessProxy.cpp      |  2 ++
> .../UIProcess/Plugins/PluginProcessProxy.cpp       |  2 +-
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 03d53386e60..220ceb1b61f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-14  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GTK][WPE]: Avoid using uninitialized launchOptions in getLaunchOptions
>+        https://bugs.webkit.org/show_bug.cgi?id=185611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Otherwise we might segfault.
>+
>+        Also be more resilient to random values passed in asserting appropriately.
>+
>+        * 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..c981227c816 100644
>--- a/Source/WebKit/UIProcess/ChildProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/ChildProcessProxy.cpp
>@@ -75,6 +75,8 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
>     case ProcessLauncher::ProcessType::Storage:
>         varname = "STORAGE_PROCESS_CMD_PREFIX";
>         break;
>+    default:
>+        ASSERT_NOT_REACHED();
>     }
>     const char* processCmdPrefix = getenv(varname);
>     if (processCmdPrefix && *processCmdPrefix)
>diff --git a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>index 4555daad3e1..08d2eb44b60 100644
>--- a/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
>@@ -91,8 +91,8 @@ PluginProcessProxy::~PluginProcessProxy()
> 
> void PluginProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
> {
>-    ChildProcessProxy::getLaunchOptions(launchOptions);
>     platformGetLaunchOptions(launchOptions, m_pluginProcessAttributes);
>+    ChildProcessProxy::getLaunchOptions(launchOptions);
> }
> 
> void PluginProcessProxy::processWillShutDown(IPC::Connection& connection)
>-- 
>2.17.0

Flags:

cgarcia: review-
cgarcia: commit-queue-

Actions: View | Formatted Diff | Diff

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