aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_process_launch__posix.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_process_launch__posix.cc')
-rw-r--r--www/chromium/files/patch-base_process_launch__posix.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index f312ca87e251..48f4348273c3 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig 2021-04-14 18:40:48 UTC
+--- base/process/launch_posix.cc.orig 2021-07-19 18:45:05 UTC
+++ base/process/launch_posix.cc
-@@ -59,12 +59,14 @@
+@@ -58,12 +58,14 @@
#if defined(OS_FREEBSD)
#include <sys/event.h>
#include <sys/ucontext.h>
@@ -15,7 +15,7 @@
extern char** environ;
namespace base {
-@@ -221,6 +223,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap
+@@ -220,6 +222,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap
DirReaderPosix fd_dir(kFDDir);
if (!fd_dir.IsValid()) {
// Fallback case: Try every possible fd.
@@ -44,7 +44,16 @@
for (size_t i = 0; i < max_fds; ++i) {
const int fd = static_cast<int>(i);
if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO)
-@@ -444,22 +468,32 @@ Process LaunchProcess(const std::vector<std::string>&
+@@ -358,7 +382,7 @@ Process LaunchProcess(const std::vector<std::string>&
+ // might do things like block waiting for threads that don't even exist
+ // in the child.
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // See comments on the ResetFDOwnership() declaration in
+ // base/files/scoped_file.h regarding why this is called early here.
+ subtle::ResetFDOwnership();
+@@ -451,22 +475,32 @@ Process LaunchProcess(const std::vector<std::string>&
// Set NO_NEW_PRIVS by default. Since NO_NEW_PRIVS only exists in kernel
// 3.5+, do not check the return value of prctl here.