Changeset 23583

Timestamp:

04/02/08 10:31:16 (8 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5835665> 10A41: SystemStarter crashes when FORTIFY is enabled

Files:

• trunk/launchd/src/StartupItems.c (modified) (2 diffs)

trunk/launchd/src/StartupItems.c

@@ -287 +287 @@
                 DIR *aDirectory;
 
-                strcpy(aPath + strlen(aPath), kStartupItemsPath);
+                strlcat(aPath, kStartupItemsPath, sizeof(aPath));
                 ++aDomainIndex;
 
@@ -924 +924 @@
         } else {
                 CFStringRef aBundlePathString = CFDictionaryGetValue(anItem, kBundlePathKey);
-                size_t aBundlePathCLength =
-                    CFStringGetMaximumSizeForEncoding(CFStringGetLength(aBundlePathString), kCFStringEncodingUTF8) + 1;
-                char *aBundlePath = (char *)malloc(aBundlePathCLength);
-                char anExecutable[PATH_MAX] = "";
-
-                if (!aBundlePath) {
-                        syslog(LOG_EMERG, "malloc() failed; out of memory while running item %s", aBundlePathString);
-                        return (anError);
-                }
-                if (!CFStringGetCString(aBundlePathString, aBundlePath, aBundlePathCLength, kCFStringEncodingUTF8)) {
+                char aBundlePath[PATH_MAX];
+                char anExecutable[PATH_MAX];
+                char *tmp;
+
+                if (!CFStringGetCString(aBundlePathString, aBundlePath, sizeof(aBundlePath), kCFStringEncodingUTF8)) {
                         CF_syslog(LOG_EMERG, CFSTR("Internal error while running item %@"), aBundlePathString);
                         return (anError);
                 }
                 /* Compute path to excecutable */
-                {
-                        char           *tmp;
-                        strncpy(anExecutable, aBundlePath, sizeof(anExecutable));       /* .../foo     */
-                        tmp = rindex(anExecutable, '/');        /* /foo        */
-                        strncat(anExecutable, tmp, strlen(tmp));        /* .../foo/foo */
-                }
-
-                free(aBundlePath);
+                tmp = rindex(aBundlePath, '/');
+                snprintf(anExecutable, sizeof(anExecutable), "%s%s", aBundlePath, tmp);
 
                 /**