Changeset 23374

Timestamp:

09/12/07 17:24:54 (15 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5477111> 'ssh localhost sudo launchctl' kills machine

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -455 +455 @@
 static bool did_first_per_user_launchd_BootCache_hack;
 static jobmgr_t background_jobmgr;
+static job_t workaround_5477111;
 static mach_timebase_info_data_t tbi;
 
@@ -1859 +1860 @@
 job_mig_destructor(job_t j)
 {
-        if (j && j->unload_at_mig_return) {
+        /*
+         * 5477111
+         *
+         * 'j' can be invalid at this point. We should fix this up after Leopard ships.
+         */
+
+        if (j && j != workaround_5477111 && j->unload_at_mig_return) {
                 job_log(j, LOG_NOTICE, "Unloading PID %u at MIG return.", j->p);
                 job_remove(j);
         }
+
+        workaround_5477111 = NULL;
 
         calendarinterval_sanity_check();
@@ -5969 +5978 @@
         jm->jm_port = 0;
 
+        workaround_5477111 = j;
+
         jobmgr_shutdown(jm);