You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
1.9 KiB
63 lines
1.9 KiB
8 months ago
|
diff --git a/src/ipc.cc b/src/ipc.cc
|
||
|
|
index 42e11e6..a68e623 100644
|
||
|
|
--- a/src/ipc.cc
|
||
|
|
+++ b/src/ipc.cc
|
||
|
|
@@ -19,6 +19,11 @@
|
||
|
|
#include "SquidConfig.h"
|
||
|
|
#include "SquidIpc.h"
|
||
|
|
#include "tools.h"
|
||
|
|
+#include <cstdlib>
|
||
|
|
+
|
||
|
|
+#if HAVE_UNISTD_H
|
||
|
|
+#include <unistd.h>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
static const char *hello_string = "hi there\n";
|
||
|
|
#ifndef HELLO_BUF_SZ
|
||
|
|
@@ -365,6 +370,22 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
|
||
|
|
}
|
||
|
|
|
||
|
|
PutEnvironment();
|
||
|
|
+
|
||
|
|
+ // A dup(2) wrapper that reports and exits the process on errors. The
|
||
|
|
+ // exiting logic is only suitable for this child process context.
|
||
|
|
+ const auto dupOrExit = [prog,name](const int oldFd) {
|
||
|
|
+ const auto newFd = dup(oldFd);
|
||
|
|
+ if (newFd < 0) {
|
||
|
|
+ const auto savedErrno = errno;
|
||
|
|
+ debugs(54, DBG_CRITICAL, "ERROR: Helper process initialization failure: " << name <<
|
||
|
|
+ Debug::Extra << "helper (CHILD) PID: " << getpid() <<
|
||
|
|
+ Debug::Extra << "helper program name: " << prog <<
|
||
|
|
+ Debug::Extra << "dup(2) system call error for FD " << oldFd << ": " << xstrerr(savedErrno));
|
||
|
|
+ _exit(EXIT_FAILURE);
|
||
|
|
+ }
|
||
|
|
+ return newFd;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* This double-dup stuff avoids problems when one of
|
||
|
|
* crfd, cwfd, or debug_log are in the rage 0-2.
|
||
|
|
@@ -372,17 +393,16 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
|
||
|
|
|
||
|
|
do {
|
||
|
|
/* First make sure 0-2 is occupied by something. Gets cleaned up later */
|
||
|
|
- x = dup(crfd);
|
||
|
|
- assert(x > -1);
|
||
|
|
- } while (x < 3 && x > -1);
|
||
|
|
+ x = dupOrExit(crfd);
|
||
|
|
+ } while (x < 3);
|
||
|
|
|
||
|
|
close(x);
|
||
|
|
|
||
|
|
- t1 = dup(crfd);
|
||
|
|
+ t1 = dupOrExit(crfd);
|
||
|
|
|
||
|
|
- t2 = dup(cwfd);
|
||
|
|
+ t2 = dupOrExit(cwfd);
|
||
|
|
|
||
|
|
- t3 = dup(fileno(debug_log));
|
||
|
|
+ t3 = dupOrExit(fileno(debug_log));
|
||
|
|
|
||
|
|
assert(t1 > 2 && t2 > 2 && t3 > 2);
|
||
|
|
|