bridges/source/cpp_uno/shared/vtablefactory.cxx | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 6cab5c9170dc167838f1aebafc47153cd84713b4
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Dec 7 21:18:25 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Dec 8 10:42:34 2020 +0100
tdf#134754: Gracefully handle EINVAL from mmap MAP_JIT on old macOS
Change-Id: Idfb148fad55c7c6b6e6f4f4b5316fd3b086f7d2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107365
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 73dc42ef6dfc..90c414290c1a 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -85,12 +85,21 @@ extern "C" void * allocExec(
p = mmap(
nullptr, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON
| MAP_JIT, -1,
0);
- if (p == MAP_FAILED) {
+ if (p != MAP_FAILED) {
+ goto done;
+ }
+ {
auto const e = errno;
- SAL_WARN("bridges.osx", "mmap failed with " << e << ", " <<
strerror(e));
- p = nullptr;
+ SAL_INFO("bridges.osx", "mmap failed with " << e);
+ if (e != EINVAL) {
+ p = nullptr;
+ goto done;
+ }
}
-#else
+ // At least some macOS 10.13 machines are reported to fail the above mmap
with EINVAL (see
+ // tdf#134754 "Crash on macOS 10.13 opening local HSQLDB-based odb file in
Base on LibreOffice 7
+ // rc1", so in that case retry with the "traditional" approach:
+#endif
p = mmap(
nullptr, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1,
0);
@@ -102,6 +111,8 @@ extern "C" void * allocExec(
munmap (p, n);
p = nullptr;
}
+#if defined MACOSX
+done:
#endif
#elif defined _WIN32
p = VirtualAlloc(nullptr, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
