<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196744] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196744">196744</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-02-17 22:13:15 -0800 (Wed, 17 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Always check the return value of dlopen() and dlsym() in Release builds
<http://webkit.org/b/154364>
Reviewed by Alexey Proskuryakov.
* platform/mac/SoftLinking.h:
(SOFT_LINK_LIBRARY): Change ASSERT_WITH_MESSAGE() to
RELEASE_ASSERT_WITH_MESSAGE().
(SOFT_LINK_FRAMEWORK): Ditto.
(SOFT_LINK_PRIVATE_FRAMEWORK): Ditto.
(SOFT_LINK_STAGED_FRAMEWORK): Ditto.
(SOFT_LINK_FRAMEWORK_IN_UMBRELLA): Ditto.
(SOFT_LINK): Ditto.
(SOFT_LINK_POINTER): Ditto.
(SOFT_LINK_CONSTANT): Ditto.
(SOFT_LINK_FRAMEWORK_FOR_SOURCE): Add
RELEASE_ASSERT_WITH_MESSAGE() when soft-link is not
optional.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSoftLinkingh">trunk/Source/WebCore/platform/mac/SoftLinking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196743 => 196744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-18 06:03:30 UTC (rev 196743)
+++ trunk/Source/WebCore/ChangeLog 2016-02-18 06:13:15 UTC (rev 196744)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-17 David Kilzer <ddkilzer@apple.com>
+
+ [Cocoa] Always check the return value of dlopen() and dlsym() in Release builds
+ <http://webkit.org/b/154364>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/mac/SoftLinking.h:
+ (SOFT_LINK_LIBRARY): Change ASSERT_WITH_MESSAGE() to
+ RELEASE_ASSERT_WITH_MESSAGE().
+ (SOFT_LINK_FRAMEWORK): Ditto.
+ (SOFT_LINK_PRIVATE_FRAMEWORK): Ditto.
+ (SOFT_LINK_STAGED_FRAMEWORK): Ditto.
+ (SOFT_LINK_FRAMEWORK_IN_UMBRELLA): Ditto.
+ (SOFT_LINK): Ditto.
+ (SOFT_LINK_POINTER): Ditto.
+ (SOFT_LINK_CONSTANT): Ditto.
+ (SOFT_LINK_FRAMEWORK_FOR_SOURCE): Add
+ RELEASE_ASSERT_WITH_MESSAGE() when soft-link is not
+ optional.
+
</ins><span class="cx"> 2016-02-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r196648): http://w3c-test.org/html/dom/interfaces.html redirects at the end of the test
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSoftLinkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SoftLinking.h (196743 => 196744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SoftLinking.h 2016-02-18 06:03:30 UTC (rev 196743)
+++ trunk/Source/WebCore/platform/mac/SoftLinking.h 2016-02-18 06:13:15 UTC (rev 196744)
</span><span class="lines">@@ -34,26 +34,33 @@
</span><span class="cx"> #define SOFT_LINK_LIBRARY(lib) \
</span><span class="cx"> static void* lib##Library() \
</span><span class="cx"> { \
</span><del>- static void* dylib = dlopen("/usr/lib/" #lib ".dylib", RTLD_NOW); \
- ASSERT_WITH_MESSAGE(dylib, "%s", dlerror()); \
</del><ins>+ static void* dylib = ^{ \
+ void *result = dlopen("/usr/lib/" #lib ".dylib", RTLD_NOW); \
+ RELEASE_ASSERT_WITH_MESSAGE(result, "%s", dlerror()); \
+ return result; \
+ }(); \
</ins><span class="cx"> return dylib; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define SOFT_LINK_FRAMEWORK(framework) \
</span><span class="cx"> static void* framework##Library() \
</span><span class="cx"> { \
</span><del>- static void* frameworkLibrary = dlopen("/System/Library/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
- ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
</del><ins>+ static void* frameworkLibrary = ^{ \
+ void* result = dlopen("/System/Library/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+ RELEASE_ASSERT_WITH_MESSAGE(result, "%s", dlerror()); \
+ return result; \
+ }(); \
</ins><span class="cx"> return frameworkLibrary; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define SOFT_LINK_PRIVATE_FRAMEWORK(framework) \
</span><span class="cx"> static void* framework##Library() \
</span><span class="cx"> { \
</span><del>- static void* frameworkLibrary = 0; \
- if (!frameworkLibrary) \
- frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
- ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
</del><ins>+ static void* frameworkLibrary = ^{ \
+ void* result = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+ RELEASE_ASSERT_WITH_MESSAGE(result, "%s", dlerror()); \
+ return result; \
+ }(); \
</ins><span class="cx"> return frameworkLibrary; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,17 +85,20 @@
</span><span class="cx"> void* result = dlopen("/System/Library/" #unstagedLocation "/" #framework ".framework/Versions/" #version "/" #framework, RTLD_LAZY); \
</span><span class="cx"> if (!result) \
</span><span class="cx"> result = dlopen("/System/Library/StagedFrameworks/Safari/" #framework ".framework/Versions/" #version "/" #framework, RTLD_LAZY); \
</span><ins>+ RELEASE_ASSERT_WITH_MESSAGE(result, "%s", dlerror()); \
</ins><span class="cx"> return result; \
</span><span class="cx"> }(); \
</span><del>- ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
</del><span class="cx"> return frameworkLibrary; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define SOFT_LINK_FRAMEWORK_IN_UMBRELLA(umbrella, framework) \
</span><span class="cx"> static void* framework##Library() \
</span><span class="cx"> { \
</span><del>- static void* frameworkLibrary = dlopen("/System/Library/Frameworks/" #umbrella ".framework/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
- ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
</del><ins>+ static void* frameworkLibrary = ^{ \
+ void* result = dlopen("/System/Library/Frameworks/" #umbrella ".framework/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
+ RELEASE_ASSERT_WITH_MESSAGE(result, "%s", dlerror()); \
+ return result; \
+ }(); \
</ins><span class="cx"> return frameworkLibrary; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,7 +112,7 @@
</span><span class="cx"> static resultType init##functionName parameterDeclarations \
</span><span class="cx"> { \
</span><span class="cx"> softLink##functionName = (resultType (*) parameterDeclarations) dlsym(framework##Library(), #functionName); \
</span><del>- ASSERT_WITH_MESSAGE(softLink##functionName, "%s", dlerror()); \
</del><ins>+ RELEASE_ASSERT_WITH_MESSAGE(softLink##functionName, "%s", dlerror()); \
</ins><span class="cx"> return softLink##functionName parameterNames; \
</span><span class="cx"> } \
</span><span class="cx"> \
</span><span class="lines">@@ -215,7 +225,7 @@
</span><span class="cx"> static type init##name() \
</span><span class="cx"> { \
</span><span class="cx"> void** pointer = static_cast<void**>(dlsym(framework##Library(), #name)); \
</span><del>- ASSERT_WITH_MESSAGE(pointer, "%s", dlerror()); \
</del><ins>+ RELEASE_ASSERT_WITH_MESSAGE(pointer, "%s", dlerror()); \
</ins><span class="cx"> pointer##name = static_cast<type>(*pointer); \
</span><span class="cx"> get##name = name##Function; \
</span><span class="cx"> return pointer##name; \
</span><span class="lines">@@ -253,7 +263,7 @@
</span><span class="cx"> static type init##name() \
</span><span class="cx"> { \
</span><span class="cx"> void* constant = dlsym(framework##Library(), #name); \
</span><del>- ASSERT_WITH_MESSAGE(constant, "%s", dlerror()); \
</del><ins>+ RELEASE_ASSERT_WITH_MESSAGE(constant, "%s", dlerror()); \
</ins><span class="cx"> constant##name = *static_cast<type*>(constant); \
</span><span class="cx"> get##name = name##Function; \
</span><span class="cx"> return constant##name; \
</span><span class="lines">@@ -308,6 +318,8 @@
</span><span class="cx"> static dispatch_once_t once; \
</span><span class="cx"> dispatch_once(&once, ^{ \
</span><span class="cx"> frameworkLibrary = dlopen("/System/Library/Frameworks/" #framework ".framework/" #framework, RTLD_NOW); \
</span><ins>+ if (!isOptional) \
+ RELEASE_ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
</ins><span class="cx"> }); \
</span><span class="cx"> ASSERT_WITH_MESSAGE_UNUSED(isOptional, isOptional || frameworkLibrary, "%s", dlerror()); \
</span><span class="cx"> return frameworkLibrary; \
</span></span></pre>
</div>
</div>
</body>
</html>