<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[23583] trunk/launchd/src/StartupItems.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23583">23583</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-04-02 10:31:16 -0700 (Wed, 02 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5835665> 10A41: SystemStarter crashes when FORTIFY is enabled</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrcStartupItemsc">trunk/launchd/src/StartupItems.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrcStartupItemsc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/StartupItems.c (23582 => 23583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/StartupItems.c 2008-04-02 16:43:05 UTC (rev 23582)
+++ trunk/launchd/src/StartupItems.c 2008-04-02 17:31:16 UTC (rev 23583)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> while ((aState = NSGetNextSearchPathEnumeration(aState, aPath))) {
</span><span class="cx"> DIR *aDirectory;
</span><span class="cx">
</span><del>- strcpy(aPath + strlen(aPath), kStartupItemsPath);
</del><ins>+ strlcat(aPath, kStartupItemsPath, sizeof(aPath));
</ins><span class="cx"> ++aDomainIndex;
</span><span class="cx">
</span><span class="cx"> /* 5485016
</span><span class="lines">@@ -923,29 +923,18 @@
</span><span class="cx"> anError = 0;
</span><span class="cx"> } else {
</span><span class="cx"> CFStringRef aBundlePathString = CFDictionaryGetValue(anItem, kBundlePathKey);
</span><del>- size_t aBundlePathCLength =
- CFStringGetMaximumSizeForEncoding(CFStringGetLength(aBundlePathString), kCFStringEncodingUTF8) + 1;
- char *aBundlePath = (char *)malloc(aBundlePathCLength);
- char anExecutable[PATH_MAX] = "";
</del><ins>+ char aBundlePath[PATH_MAX];
+ char anExecutable[PATH_MAX];
+ char *tmp;
</ins><span class="cx">
</span><del>- if (!aBundlePath) {
- syslog(LOG_EMERG, "malloc() failed; out of memory while running item %s", aBundlePathString);
- return (anError);
- }
- if (!CFStringGetCString(aBundlePathString, aBundlePath, aBundlePathCLength, kCFStringEncodingUTF8)) {
</del><ins>+ if (!CFStringGetCString(aBundlePathString, aBundlePath, sizeof(aBundlePath), kCFStringEncodingUTF8)) {
</ins><span class="cx"> CF_syslog(LOG_EMERG, CFSTR("Internal error while running item %@"), aBundlePathString);
</span><span class="cx"> return (anError);
</span><span class="cx"> }
</span><span class="cx"> /* Compute path to excecutable */
</span><del>- {
- char *tmp;
- strncpy(anExecutable, aBundlePath, sizeof(anExecutable)); /* .../foo */
- tmp = rindex(anExecutable, '/'); /* /foo */
- strncat(anExecutable, tmp, strlen(tmp)); /* .../foo/foo */
- }
</del><ins>+ tmp = rindex(aBundlePath, '/');
+ snprintf(anExecutable, sizeof(anExecutable), "%s%s", aBundlePath, tmp);
</ins><span class="cx">
</span><del>- free(aBundlePath);
-
</del><span class="cx"> /**
</span><span class="cx"> * Run the bundle
</span><span class="cx"> **/
</span></span></pre>
</div>
</div>
</body>
</html>