Differential D38165 Diff 118368 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc

Changeset View

Standalone View

www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc

	--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2019-05-23 12:39:34 UTC			--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2021-12-15 16:12:54 UTC
	+++ src/3rdparty/chromium/base/process/launch_posix.cc			+++ src/3rdparty/chromium/base/process/launch_posix.cc
	@@ -64,6 +64,7 @@			@@ -65,6 +65,7 @@
	#error "macOS should use launch_mac.cc"			#error "macOS should use launch_mac.cc"
	#endif			#endif

	+#pragma weak environ			+#pragma weak environ
	extern char** environ;			extern char** environ;

	namespace base {			namespace base {
				@@ -228,6 +229,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap
				DirReaderPosix fd_dir(kFDDir);
				if (!fd_dir.IsValid()) {
				// Fallback case: Try every possible fd.
				+
				+#if defined(OS_FREEBSD)
				+ // CEM: blast away most of the range with closefrom(). A common use case
				+ // of this function only maps STDIN/STDOUT/STDERR and closefrom(3) is much
				+ // cheaper than x00,000 close(2) invocations with a high RLIMIT_NOFILE.
				+ //
				+ // In the other caller, it is still very likely that the fds we care about
				+ // are in relatively low number space and we can save hundreds of thousands
				+ // of syscalls.
				+ int max_valid_fd = -1;
				+ for (size_t j = 0; j < saved_mapping.size(); j++) {
				+ int fd = saved_mapping[j].dest;
				+ if (fd > max_valid_fd)
				+ max_valid_fd = fd;
				+ }
				+ if (max_valid_fd < STDERR_FILENO)
				+ max_valid_fd = STDERR_FILENO;
				+
				+ closefrom(max_valid_fd + 1);
				+ max_fds = static_cast<size_t>(max_valid_fd) + 1;
				+#endif
				+
				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)