Changeset 23557

Timestamp:

2008-03-18 10:47:38 (7 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5795236> Unix callbacks can delete the underlying control block

Files:

• branches/SULeopard/launchd/src/liblaunch.c (modified) (3 diffs)

branches/SULeopard/launchd/src/liblaunch.c

@@ -148 +148 @@
 static void launch_mach_checkin_service(launch_data_t obj, const char *key, void *context);
 
+static launch_t in_flight_msg_recv_client;
 static pthread_once_t _lc_once = PTHREAD_ONCE_INIT;
 
@@ -563 +564 @@
 launchd_close(launch_t lh, typeof(close) closefunc)
 {
+        if (in_flight_msg_recv_client == lh) {
+                in_flight_msg_recv_client = NULL;
+        }
+
         if (lh->sendbuf)
                 free(lh->sendbuf);
@@ -1010 +1015 @@
                 }
 
+                in_flight_msg_recv_client = lh;
+
                 cb(rmsg, context);
+
+                /* launchd and only launchd can call launchd_close() as a part of the callback */
+                if (in_flight_msg_recv_client == NULL) {
+                        r = 0;
+                        break;
+                }
 
                 lh->recvlen -= data_offset;