This makes our handling of the pid more intentional. We need to get

our pid into the childQueue as soon as possible.  If it is not in there
when when it fires, then it's signal will be lost forever.

diff --git a/faxd/Job.c++ b/faxd/Job.c++
index e38164933e113714f4c95e9ce7b2be7600a95bbd..9b9302dde2dcf468f1b2e30f798fd7ef068353c0 100644 (file)
--- a/faxd/Job.c++
+++ b/faxd/Job.c++
@@ -207,13 +207,21 @@ Job::startSend(pid_t p)
 void
 Job::startControl(pid_t p, int fd)
 {
-    if (jci) {
-       delete jci;
-       jci = NULL;
-    }
+    // Order is important here.
+    // 1) We need to guaranted that jci is NULL and not needed, incase
+    //  our SIGCHLD comes before we get to delete it.
+    // 2) We want our child pid noted as soon as possible (once we're sure
+    //    jci is taken care of)
+    // And then we can worry about deleting and linking fd...
+    JobControlInfo *tmp_jci = jci;
+    jci = NULL;
+    Dispatcher::instance().startChild(pid = p, &ctrlHandler);
+
+    if (tmp_jci)
+       delete tmp_jci;
+
     ctrlHandler.fd = fd;
     Dispatcher::instance().link(fd, Dispatcher::ReadMask, &ctrlHandler);
-    Dispatcher::instance().startChild(pid = p, &ctrlHandler);
 }
 
 fxStr

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index f47842deb000eebf9c86ebb0ca243a7cbfc9177a..2c821c2dd9c06bc351d8c7f7a0e87e8051f7fdca 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -1642,10 +1642,8 @@ faxQueueApp::setReadyToRun(Job& job)
                _exit(255);
                /*NOTREACHED*/
            default:                    // parent, read from pipe and wait
+               job.startControl(pid, pfd[0]);  // First, get our child PID handled
                Sys::close(pfd[1]);
-
-               job.startControl(pid, pfd[0]);
-
            }
        }
        if (jobCtrlWait)