Skip to content

Commit

Permalink
fix: disable partition alloc on mac (#33117)
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 6dc7384 commit 3bbbf4b
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 @@ -111,3 +111,4 @@ fix_dont_delete_SerialPortManager_on_main_thread.patch
feat_add_data_transfer_to_requestsingleinstancelock.patch
fix_crash_when_saving_edited_pdf_files.patch
port_autofill_colors_to_the_color_pipeline.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 12:07:25 -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 56acfed89ec4ad4ee568a1b517923efa4b4e9c1f..a1da35a84f896d158ac88368ff6d95025a23ff95 100644
--- a/base/allocator/allocator.gni
+++ b/base/allocator/allocator.gni
@@ -20,7 +20,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)

# - NaCl: No plans to support it.
# - iOS: not done yet.
-_is_partition_alloc_platform = !is_nacl && !is_ios
+_is_partition_alloc_platform = !is_nacl && !is_ios && !is_mac

# Under Windows Debug the allocator shim is not compatible with CRT.
# NaCl in particular does seem to link some binaries statically

0 comments on commit 3bbbf4b

Please sign in to comment.