<!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>[160649] trunk/Tools</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/160649">160649</a></dd>
<dt>Author</dt> <dd>dfarler@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 10:17:01 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ASAN] WebKitLauncher: Include libasancrashreporter.dylib in DYLD_INSERT_LIBRARIES if it exists
https://bugs.webkit.org/show_bug.cgi?id=124610
Reviewed by Mark Rowe.
* WebKitLauncher/WebKitNightlyEnabler.m:
(enableWebKitNightlyBehaviour):
Add libasancrashreporter.dylib to DYLD_INSERT_LIBRARIES.
* WebKitLauncher/main.m:
(main):
Include both libasancrashreporter and the nightly enabler to
the list of libraries to insert.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitLauncherWebKitNightlyEnablerm">trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m</a></li>
<li><a href="#trunkToolsWebKitLaunchermainm">trunk/Tools/WebKitLauncher/main.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160648 => 160649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-16 18:10:58 UTC (rev 160648)
+++ trunk/Tools/ChangeLog 2013-12-16 18:17:01 UTC (rev 160649)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-16 David Farler <dfarler@apple.com>
+
+ [ASAN] WebKitLauncher: Include libasancrashreporter.dylib in DYLD_INSERT_LIBRARIES if it exists
+ https://bugs.webkit.org/show_bug.cgi?id=124610
+
+ Reviewed by Mark Rowe.
+
+ * WebKitLauncher/WebKitNightlyEnabler.m:
+ (enableWebKitNightlyBehaviour):
+ Add libasancrashreporter.dylib to DYLD_INSERT_LIBRARIES.
+ * WebKitLauncher/main.m:
+ (main):
+ Include both libasancrashreporter and the nightly enabler to
+ the list of libraries to insert.
+
</ins><span class="cx"> 2013-12-16 Gergo Balogh <geryxyz@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Resolve inconsistant style warning caused by r160319.
</span></span></pre></div>
<a id="trunkToolsWebKitLauncherWebKitNightlyEnablerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m (160648 => 160649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m 2013-12-16 18:10:58 UTC (rev 160648)
+++ trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m 2013-12-16 18:17:01 UTC (rev 160649)
</span><span class="lines">@@ -139,6 +139,11 @@
</span><span class="cx"> unsetenv("DYLD_INSERT_LIBRARIES");
</span><span class="cx"> poseAsWebKitApp();
</span><span class="cx">
</span><ins>+ NSString *pathToASanCrashReporterLib = [webKitLauncherBundle() pathForResource:@"libasancrashreporter" ofType:@"dylib"];
+
+ if (pathToASanCrashReporterLib)
+ setenv("DYLD_INSERT_LIBRARIES", [pathToASanCrashReporterLib UTF8String], 1);
+
</ins><span class="cx"> extensionPaths = [[NSSet alloc] initWithObjects:@"~/Library/InputManagers/", @"/Library/InputManagers/",
</span><span class="cx"> @"~/Library/Application Support/SIMBL/Plugins/", @"/Library/Application Support/SIMBL/Plugins/",
</span><span class="cx"> @"~/Library/Application Enhancers/", @"/Library/Application Enhancers/",
</span></span></pre></div>
<a id="trunkToolsWebKitLaunchermainm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitLauncher/main.m (160648 => 160649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitLauncher/main.m 2013-12-16 18:10:58 UTC (rev 160648)
+++ trunk/Tools/WebKitLauncher/main.m 2013-12-16 18:17:01 UTC (rev 160649)
</span><span class="lines">@@ -246,6 +246,10 @@
</span><span class="cx"> [NSString stringWithFormat:@"Nightly builds of WebKit are not supported on OS X %@ at this time.", systemVersion]);
</span><span class="cx">
</span><span class="cx"> NSString *pathToEnablerLib = [[NSBundle mainBundle] pathForResource:@"WebKitNightlyEnabler" ofType:@"dylib"];
</span><ins>+ NSString *dyldInsertLibraries = pathToEnablerLib;
+ NSString *pathToASanCrashReporterLib = [[NSBundle mainBundle] pathForResource:@"libasancrashreporter" ofType:@"dylib"];
+ if (pathToASanCrashReporterLib)
+ dyldInsertLibraries = [@[ pathToASanCrashReporterLib, pathToEnablerLib ] componentsJoinedByString:@":"];
</ins><span class="cx">
</span><span class="cx"> NSBundle *safariBundle = locateSafariBundle();
</span><span class="cx"> NSString *executablePath = determineExecutablePath(safariBundle);
</span><span class="lines">@@ -263,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> NSMutableArray *arguments = [NSMutableArray arrayWithObject:executablePath];
</span><span class="cx"> NSMutableDictionary *environment = [[[NSDictionary dictionaryWithObjectsAndKeys:frameworkPath, @"DYLD_FRAMEWORK_PATH", @"YES", @"WEBKIT_UNSET_DYLD_FRAMEWORK_PATH",
</span><del>- pathToEnablerLib, @"DYLD_INSERT_LIBRARIES", [[NSBundle mainBundle] executablePath], @"WebKitAppPath", nil] mutableCopy] autorelease];
</del><ins>+ dyldInsertLibraries, @"DYLD_INSERT_LIBRARIES", [[NSBundle mainBundle] executablePath], @"WebKitAppPath", nil] mutableCopy] autorelease];
</ins><span class="cx"> [environment addEntriesFromDictionary:[[NSProcessInfo processInfo] environment]];
</span><span class="cx"> addStartPageToArgumentsIfNeeded(arguments);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>