Skip to content

Commit

Permalink
fix: disable partition alloc on mac (#33116)
Browse files Browse the repository at this point in the history
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
  • Loading branch information
trop[bot] and VerteDinde committed Mar 2, 2022
1 parent f0815ca commit d02dd1b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
1 change: 1 addition & 0 deletions patches/chromium/.patches
Expand Up @@ -114,3 +114,4 @@ fix_dont_delete_SerialPortManager_on_main_thread.patch
fix_crash_when_saving_edited_pdf_files.patch
cherry-pick-f5101995acd2.patch
fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
build_disable_partition_alloc_on_mac.patch
23 changes: 23 additions & 0 deletions patches/chromium/build_disable_partition_alloc_on_mac.patch
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: VerteDinde <vertedinde@electronjs.org>
Date: Tue, 1 Mar 2022 16:02:22 -0800
Subject: build: disable partition alloc on mac

Enabling partition alloc caused a crash when spawning
a child process. This patch disables partition alloc for mac,
and can be removed when the crash in fork is resolved.
Related issue: https://github.com/electron/electron/issues/32718

diff --git a/base/allocator/allocator.gni b/base/allocator/allocator.gni
index 2c35e82ec5ad94840cc894cc55bb90e7c4c00d4f..af34f85f686f61a1d4dc2ee1248af4d0b61e4cb6 100644
--- a/base/allocator/allocator.gni
+++ b/base/allocator/allocator.gni
@@ -18,7 +18,7 @@ _is_using_sanitizers = is_asan || is_hwasan || is_lsan || is_tsan || is_msan
# - Windows: debug CRT is not compatible, see below.
_disable_partition_alloc = is_component_build || (is_win && is_debug)
_is_partition_alloc_platform =
- is_android || is_win || is_mac || is_linux || is_chromeos ||
+ is_android || is_win || is_linux || is_chromeos ||
# TODO(crbug.com/1278780): Allow x64 once compatible with safe-stack.
(is_fuchsia && target_cpu == "arm64")

0 comments on commit d02dd1b

Please sign in to comment.