desktop/Executable_soffice_bin.mk | 23 +++++++++++++++++++++++
desktop/util/macos/__objc_fork_ok_data.txt |binary
2 files changed, 23 insertions(+)
New commits:
commit c6652e280b0690497abf27380dd064898f91db32
Author: Patrick Luby <plub...@libreoffice.org>
AuthorDate: Fri Jan 26 12:19:17 2024 -0500
Commit: Patrick Luby <plub...@libreoffice.org>
CommitDate: Fri Jan 26 21:44:05 2024 +0100
tdf#152524 Add a __objc_fork_ok data section for Mac Intel executable
This attempts to fix a particularly difficult to debug crash due to
memory corruption when gpgme tries to fork and exec a gpg command.
For more background, see the following bug comment:
https://bugs.documentfoundation.org/show_bug.cgi?id=152524#c39
This data section is only added in Mac Intel builds as it is a
controversial approach and I have not seen any reports of this bug
on Mac Silicon yet. So limit the fix only to Mac Intel in the hope
that this controversial approach will automatically phase itself
out when Apple eventually stops releasing new versions of macOS
for Mac Intel.
Note: the Objective C runtime doesn't appear to check the value of
this data section, but set it to 1 in case that changes in the future.
Change-Id: Ifac7893589a9183e092724297aff93eb3d58ab70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162634
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plub...@libreoffice.org>
diff --git a/desktop/Executable_soffice_bin.mk
b/desktop/Executable_soffice_bin.mk
index c2d811c2e86c..fbdf07a5e531 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -58,4 +58,27 @@ $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
endif
+ifeq ($(OS),MACOSX)
+ifeq ($(CPUNAME),X86_64)
+
+# tdf#152524 Add a __objc_fork_ok data section for Mac Intel executable
+# This attempts to fix a particularly difficult to debug crash due to
+# memory corruption when gpgme tries to fork and exec a gpg command.
+# For more background, see the following bug comment:
+# https://bugs.documentfoundation.org/show_bug.cgi?id=152524#c39
+# This data section is only added in Mac Intel builds as it is a
+# controversial approach and I have not seen any reports of this bug
+# on Mac Silicon yet. So limit the fix only to Mac Intel in the hope
+# that this controversial approach will automatically phase itself
+# out when Apple eventually stops releasing new versions of macOS
+# for Mac Intel.
+# Note: the Objective C runtime doesn't appear to check the value of
+# this data section, but set it to 1 in case that changes in the future.
+$(eval $(call gb_Executable_add_ldflags,soffice_bin,\
+ -sectcreate __DATA __objc_fork_ok
$(SRCDIR)/desktop/util/macos/__objc_fork_ok_data.txt \
+))
+
+endif
+endif
+
# vim: set ts=4 sw=4 et:
diff --git a/desktop/util/macos/__objc_fork_ok_data.txt
b/desktop/util/macos/__objc_fork_ok_data.txt
new file mode 100644
index 000000000000..f66c9cf4c967
Binary files /dev/null and b/desktop/util/macos/__objc_fork_ok_data.txt differ
