From 1c4decadfef356ebe11f73bb839fac196e1f4fa0 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 7 Jun 2018 01:22:49 +0100
Subject: Disable name demangling via libc++abi on OS X to avoid malloc abort
trap on OS X 10.14 Mojave
---
indra/llcommon/llerror.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index f31a054139..e3e2698ba7 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -247,6 +247,13 @@ namespace LLError
{
std::string Log::demangle(const char* mangled)
{
+
+#if LL_DARWIN
+ // MAINT-8724 libc++abi demangling causes malloc check failures
+ // that abort the application on OS X 10.14 Mojave so the easy
+ // fix is to disable demangling until a better fix can be found.
+ return mangled;
+#else
#ifdef __GNUC__
// GCC: type_info::name() returns a mangled class name,st demangle
@@ -282,6 +289,7 @@ namespace LLError
#else
return mangled;
+#endif
#endif
}
} // LLError
--
cgit v1.2.3