Title: [201983] trunk/Source/bmalloc
Revision
201983
Author
[email protected]
Date
2016-06-12 06:22:53 -0700 (Sun, 12 Jun 2016)

Log Message

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/.

Modified Paths

Diff

Modified: trunk/Source/bmalloc/ChangeLog (201982 => 201983)


--- trunk/Source/bmalloc/ChangeLog	2016-06-12 01:14:58 UTC (rev 201982)
+++ trunk/Source/bmalloc/ChangeLog	2016-06-12 13:22:53 UTC (rev 201983)
@@ -1,3 +1,18 @@
+2016-06-12  David Kilzer  <[email protected]>
+
+        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  <[email protected]>
 
         Implement logging for RELEASE_BASSERT_WITH_MESSAGE() in BAssert.h

Modified: trunk/Source/bmalloc/bmalloc/Logging.cpp (201982 => 201983)


--- trunk/Source/bmalloc/bmalloc/Logging.cpp	2016-06-12 01:14:58 UTC (rev 201982)
+++ trunk/Source/bmalloc/bmalloc/Logging.cpp	2016-06-12 13:22:53 UTC (rev 201983)
@@ -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
 

Modified: trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h (201982 => 201983)


--- trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h	2016-06-12 01:14:58 UTC (rev 201982)
+++ trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h	2016-06-12 13:22:53 UTC (rev 201983)
@@ -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; \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to