Crash in com.apple.WebKit.WebContent at std::__1::__call_once_proxy<std::__1::tuple...

<https://webkit.org/b/158660>
<rdar://problem/25652686>

Reviewed by Darin Adler.

* bmalloc/Logging.cpp: Switch to use
BSOFT_LINK_PRIVATE_FRAMEWORK() to link
CrashReporterSupport.framework.
* bmalloc/darwin/BSoftLinking.h:
(BSOFT_LINK_PRIVATE_FRAMEWORK): Rename from BSOFT_LINK_FRAMEWORK.
Switch to use /System/Library/PrivateFrameworks/.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@201983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index 85b1230..e9244a6 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,18 @@
+2016-06-12  David Kilzer  <ddkilzer@apple.com>
+
+        Crash in com.apple.WebKit.WebContent at std::__1::__call_once_proxy<std::__1::tuple<CrashReporterSupportLibrary()::$_0&&> >
+        <https://webkit.org/b/158660>
+        <rdar://problem/25652686>
+
+        Reviewed by Darin Adler.
+
+        * bmalloc/Logging.cpp: Switch to use
+        BSOFT_LINK_PRIVATE_FRAMEWORK() to link
+        CrashReporterSupport.framework.
+        * bmalloc/darwin/BSoftLinking.h:
+        (BSOFT_LINK_PRIVATE_FRAMEWORK): Rename from BSOFT_LINK_FRAMEWORK.
+        Switch to use /System/Library/PrivateFrameworks/.
+
 2016-06-11  David Kilzer  <ddkilzer@apple.com>
 
         Implement logging for RELEASE_BASSERT_WITH_MESSAGE() in BAssert.h

diff --git a/Source/bmalloc/bmalloc/Logging.cpp b/Source/bmalloc/bmalloc/Logging.cpp
index 0833225..e1fb60c 100644 (file)
--- a/Source/bmalloc/bmalloc/Logging.cpp
+++ b/Source/bmalloc/bmalloc/Logging.cpp
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #include "BSoftLinking.h"
-BSOFT_LINK_FRAMEWORK(CrashReporterSupport);
+BSOFT_LINK_PRIVATE_FRAMEWORK(CrashReporterSupport);
 BSOFT_LINK_FUNCTION(CrashReporterSupport, SimulateCrash, BOOL, (pid_t pid, mach_exception_data_type_t exceptionCode, id description), (pid, exceptionCode, description));
 #endif
 

diff --git a/Source/bmalloc/bmalloc/darwin/BSoftLinking.h b/Source/bmalloc/bmalloc/darwin/BSoftLinking.h
index 0656f0c..36a9fcf 100644 (file)
--- a/Source/bmalloc/bmalloc/darwin/BSoftLinking.h
+++ b/Source/bmalloc/bmalloc/darwin/BSoftLinking.h
@@ -29,13 +29,13 @@
 #include <dlfcn.h>
 #include <mutex>
 
-#define BSOFT_LINK_FRAMEWORK(framework) \
+#define BSOFT_LINK_PRIVATE_FRAMEWORK(framework) \
     static void* framework##Library() \
     { \
         static void* frameworkLibrary; \
         static std::once_flag once; \
         std::call_once(once, [] { \
-            frameworkLibrary = dlopen("/System/Library/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+            frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
             RELEASE_BASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
         }); \
         return frameworkLibrary; \