42e7cd9b3f* chore: bump chromium in DEPS to 113.0.5670.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Tue, 16 Apr 2019 11:25:08 -0700
|
|
Subject: unsandboxed_ppapi_processes_skip_zygote.patch
|
|
|
|
Unsandboxed ppapi processes should skip zygote.
|
|
|
|
diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
|
|
index b141cfe3cc2e6e6563af03249bf5ec849e26d819..a1cc958e16162eee9686c73c207effe4880d50c7 100644
|
|
--- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
|
|
+++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
|
|
@@ -10,6 +10,7 @@
|
|
#include "build/build_config.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "sandbox/policy/mojom/sandbox.mojom.h"
|
|
+#include "sandbox/policy/switches.h"
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include "sandbox/policy/win/sandbox_win.h"
|
|
@@ -58,6 +59,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::AllowWindowsFontsDir() {
|
|
ZygoteCommunication* PpapiPluginSandboxedProcessLauncherDelegate::GetZygote() {
|
|
const base::CommandLine& browser_command_line =
|
|
*base::CommandLine::ForCurrentProcess();
|
|
+ if (browser_command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
|
|
+ return nullptr;
|
|
+ }
|
|
base::CommandLine::StringType plugin_launcher =
|
|
browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
|
|
if (!plugin_launcher.empty())
|