Changeset 23385

Timestamp:

09/13/07 17:45:13 (15 months ago)

Author:

zarzycki@…

Message:

More sanity checks.

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -405 +405 @@
 static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond);
 static const char *job_prog(job_t j);
-static pid_t job_get_pid(job_t j);
 static jobmgr_t job_get_bs(job_t j);
 static void job_kill(job_t j);
@@ -4476 +4475 @@
 }
 
-pid_t
-job_get_pid(job_t j)
-{
-        return j->p;
-}
-
 void
 job_force_sampletool(job_t j)
@@ -6221 +6214 @@
         }
 
-        if (indataCnt == 0) {
+        if (!job_assumes(j, indataCnt != 0)) {
                 return 1;
         }
@@ -6230 +6223 @@
 
         jr = jobmgr_import2(j->mgr, input_obj);
-
-        if (jr == NULL) switch (errno) {
-        case EEXIST:
-                return BOOTSTRAP_NAME_IN_USE;
-        default:
-                return BOOTSTRAP_NO_MEMORY;
+        
+        if (!job_assumes(j, jr != NULL)) {
+                switch (errno) {
+                case EEXIST:
+                        return BOOTSTRAP_NAME_IN_USE;
+                default:
+                        return BOOTSTRAP_NO_MEMORY;
+                }
         }
 
@@ -6255 +6250 @@
         }
 
+        job_assumes(jr, jr->p);
+
         if (!job_setup_machport(jr)) {
                 job_remove(jr);
@@ -6262 +6259 @@
         job_log(j, LOG_INFO, "Spawned");
 
-        *child_pid = job_get_pid(jr);
+        *child_pid = jr->p;
         *obsvr_port = jr->j_port;