Changeset 23543

Timestamp:

03/10/08 13:49:07 (9 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5790562> dirname() is tricky

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (13 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -173 +173 @@
         int *fds;
         unsigned int junkfds:1, fd_cnt:31;
-        char name[0];
+        union {
+                const char name[0];
+                char name_init[0];
+        };
 };
 
@@ -205 +208 @@
         SLIST_ENTRY(envitem) sle;
         char *value;
-        char key[0];
+        union {
+                const char key[0];
+                char key_init[0];
+        };
 };
 
@@ -245 +251 @@
         semaphore_reason_t why;
         int fd;
-        char what[0];
+        union {
+                const char what[0];
+                char what_init[0];
+        };
 };
 
@@ -283 +292 @@
         unsigned int normal_active_cnt;
         unsigned int sent_stop_to_normal_jobs:1, sent_stop_to_hopefully_last_jobs:1, shutting_down:1, session_initialized:1, __junk:28;
-        char name[0];
+        union {
+                const char name[0];
+                char name_init[0];
+        };
 };
 
@@ -3500 +3512 @@
 semaphoreitem_watch(job_t j, struct semaphoreitem *si)
 {
-        char parentdir_path[PATH_MAX], *which_path = si->what;
+        char *parentdir, tmp_path[PATH_MAX];
+        const char *which_path = si->what;
         int saved_errno = 0;
         int fflags = 0;
-        
-        strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path));
 
         switch (si->why) {
@@ -3518 +3529 @@
                 break;
         default:
+                return;
+        }
+
+        /* dirname() may modify tmp_path */
+        strlcpy(tmp_path, si->what, sizeof(tmp_path));
+
+        if (!job_assumes(j, (parentdir = dirname(tmp_path)))) {
                 return;
         }
@@ -3525 +3543 @@
                 if (si->fd == -1) {
                         if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) {
-                                which_path = parentdir_path;
+                                which_path = parentdir;
                                 si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY));
                         }
@@ -3766 +3784 @@
 
         memcpy(sg->fds, fds, fd_cnt * sizeof(int));
-        strcpy(sg->name, name);
+        strcpy(sg->name_init, name);
 
         SLIST_INSERT_HEAD(&j->sockets, sg, sle);
@@ -3858 +3876 @@
         }
 
-        strcpy(ei->key, k);
-        ei->value = ei->key + strlen(k) + 1;
+        strcpy(ei->key_init, k);
+        ei->value = ei->key_init + strlen(k) + 1;
         strcpy(ei->value, v);
 
@@ -4556 +4574 @@
 
         jmr->kqjobmgr_callback = jobmgr_callback;
-        strcpy(jmr->name, name ? name : "Under construction");
+        strcpy(jmr->name_init, name ? name : "Under construction");
 
         jmr->req_port = requestorport;
@@ -4604 +4622 @@
 
         if (!name) {
-                sprintf(jmr->name, "%u", MACH_PORT_INDEX(jmr->jm_port));
+                sprintf(jmr->name_init, "%u", MACH_PORT_INDEX(jmr->jm_port));
         }
 
@@ -5046 +5064 @@
 
         if (what) {
-                strcpy(si->what, what);
+                strcpy(si->what_init, what);
         }
 
@@ -6326 +6344 @@
 
                 jobmgr_log(j->mgr, LOG_DEBUG, "Renaming to: %s", session_type);
-                strcpy(j->mgr->name, session_type);
+                strcpy(j->mgr->name_init, session_type);
 
                 if (job_assumes(j, (j2 = jobmgr_init_session(j->mgr, session_type, false)))) {