Changeset 23307

Timestamp:

07/12/07 13:05:47 (17 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5328938> 9A491: syslogd crashed 12 times in _vprocmgr_log_drain

Files:

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

trunk/launchd/src/libvproc.c

@@ -396 +396 @@
 _vprocmgr_log_drain(vproc_t vp __attribute__((unused)), pthread_mutex_t *mutex, _vprocmgr_log_drain_callback_t func)
 {
-        mach_msg_type_number_t outdata_cnt;
+        mach_msg_type_number_t outdata_cnt, tmp_cnt;
         vm_offset_t outdata = 0;
         struct logmsg_s *lm;
@@ -408 +408 @@
         }
 
+        tmp_cnt = outdata_cnt;
+
         if (mutex) {
                 pthread_mutex_lock(mutex);
         }
 
-        for (lm = (struct logmsg_s *)outdata; lm->obj_sz; lm = ((void *)lm + lm->obj_sz)) {
+        for (lm = (struct logmsg_s *)outdata; tmp_cnt > 0; lm = ((void *)lm + lm->obj_sz)) {
                 lm->from_name += (size_t)lm;
                 lm->about_name += (size_t)lm;
@@ -418 +420 @@
                 lm->session_name += (size_t)lm;
 
-                func(&lm->when, lm->from_pid, lm->about_pid, lm->sender_uid, lm->sender_gid, lm->pri, lm->from_name, lm->about_name, lm->session_name, lm->msg);
+                func(&lm->when, lm->from_pid, lm->about_pid, lm->sender_uid, lm->sender_gid, lm->pri,
+                                lm->from_name, lm->about_name, lm->session_name, lm->msg);
+
+                tmp_cnt -= lm->obj_sz;
         }