Changeset 23433

Timestamp:

10/01/07 08:20:34 (14 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5500277> Bug: launchd_core_logic.c:3857 (23417):0: j->wait4pipe_eof

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -2222 +2222 @@
 {
         char *msg, *bufindex, *buf = malloc(BIG_PIPE_SIZE + 1);
+        bool close_log_redir = false;
         ssize_t rsz;
 
@@ -2234 +2235 @@
         if (rsz == 0) {
                 job_log(j, LOG_DEBUG, "Standard out/error pipe closed");
-                job_assumes(j, runtime_close(j->log_redirect_fd) != -1);
-                j->log_redirect_fd = 0;
-                job_dispatch(j, false);
-        } else if (job_assumes(j, rsz != -1)) {
+                close_log_redir = true;
+        } else if (!job_assumes(j, rsz != -1)) {
+                close_log_redir = true;
+        } else {
                 buf[rsz] = '\0';
 
@@ -2248 +2249 @@
 
         free(buf);
+
+        if (close_log_redir) {
+                job_assumes(j, runtime_close(j->log_redirect_fd) != -1);
+                j->log_redirect_fd = 0;
+                job_dispatch(j, false);
+        }
 }
 
@@ -3887 +3894 @@
 
         if (j->log_redirect_fd) {
-                job_assumes(j, j->wait4pipe_eof);
-                return "Standard out/error is still valid";
+                if (job_assumes(j, j->wait4pipe_eof)) {
+                        return "Standard out/error is still valid";
+                } else {
+                        job_assumes(j, runtime_close(j->log_redirect_fd) != -1);
+                        j->log_redirect_fd = 0;
+                }
         }