зеркало из https://github.com/electron/electron.git
30 строки
1.4 KiB
Diff
30 строки
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 a0d6f0353bb387e6eca9f2b13ab1d40996234110..8548abdfae14d630794abc1033f9b9eda59f771b 100644
|
|
--- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
|
|
+++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
|
|
@@ -7,6 +7,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 "base/win/windows_version.h"
|
|
@@ -63,6 +64,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
|
|
ZygoteHandle 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())
|