Disable name demangling via libc++abi on OS X to avoid malloc abort trap on OS X 10.14 Mojave

1 files changed, 8 insertions, 0 deletions

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
 
@@ -283,6 +290,7 @@ namespace LLError
 #else
 		return mangled;
 #endif
+#endif
 	}
 } // LLError