tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up the patch for the crash issue in the Process class 

fixes #13655
This commit is contained in:
Gunnar Beutner 2017-01-12 09:53:00 +01:00
parent 9fa3f3b122
commit 060e20f5a3
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/base/process.cpp
View File

@ -256,7 +256,7 @@ static void ProcessHandler(void)
struct iovec io; struct iovec io;
io.iov_base = &length; io.iov_base = &length;
io.iov_len = sizeof(size_t); io.iov_len = sizeof(length);
msg.msg_iov = &io; msg.msg_iov = &io;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
@ -267,17 +267,11 @@ static void ProcessHandler(void)
int rc = recvmsg(l_ProcessControlFD, &msg, 0); int rc = recvmsg(l_ProcessControlFD, &msg, 0);
if (rc < 0 && (errno == EINTR || errno == EAGAIN)) if (rc <= 0) {
continue; if (rc < 0 && (errno == EINTR || errno == EAGAIN))
continue;
if (rc < 0) { break;
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("recvmsg")
<< boost::errinfo_errno(errno));
}
if (length > 1024 * 1024 * 1024) {
BOOST_THROW_EXCEPTION(std::runtime_error("invalid message length"));
} }
char *mbuf = new char[length]; char *mbuf = new char[length];
@ -286,15 +280,13 @@ static void ProcessHandler(void)
while (count < length) { while (count < length) {
rc = recv(l_ProcessControlFD, mbuf + count, length - count, 0); rc = recv(l_ProcessControlFD, mbuf + count, length - count, 0);
if (rc < 0) { if (rc <= 0) {
if (errno == EINTR || errno == EAGAIN) if (rc < 0 && (errno == EINTR || errno == EAGAIN))
continue; continue;
delete [] mbuf; delete [] mbuf;
BOOST_THROW_EXCEPTION(posix_error() _exit(0);
<< boost::errinfo_api_function("recv")
<< boost::errinfo_errno(errno));
} }
count += rc; count += rc;
@ -391,7 +383,7 @@ static pid_t ProcessSpawn(const std::vector<String>& arguments, const Dictionary
struct iovec io; struct iovec io;
io.iov_base = &length; io.iov_base = &length;
io.iov_len = sizeof(size_t); io.iov_len = sizeof(length);
msg.msg_iov = &io; msg.msg_iov = &io;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
@ -409,14 +401,12 @@ static pid_t ProcessSpawn(const std::vector<String>& arguments, const Dictionary
msg.msg_controllen = cmsg->cmsg_len; msg.msg_controllen = cmsg->cmsg_len;
send_message:
while (sendmsg(l_ProcessControlFD, &msg, 0) < 0) while (sendmsg(l_ProcessControlFD, &msg, 0) < 0)
StartSpawnProcessHelper(); StartSpawnProcessHelper();
if (send(l_ProcessControlFD, jrequest.CStr(), jrequest.GetLength(), 0) < 0) { if (send(l_ProcessControlFD, jrequest.CStr(), jrequest.GetLength(), 0) < 0)
BOOST_THROW_EXCEPTION(posix_error() goto send_message;
<< boost::errinfo_api_function("send")
<< boost::errinfo_errno(errno));
}
char buf[4096]; char buf[4096];
@ -443,14 +433,12 @@ static int ProcessKill(pid_t pid, int signum)
boost::mutex::scoped_lock lock(l_ProcessControlMutex); boost::mutex::scoped_lock lock(l_ProcessControlMutex);
while (send(l_ProcessControlFD, &length, sizeof(size_t), 0) < 0) send_message:
while (send(l_ProcessControlFD, &length, sizeof(length), 0) < 0)
StartSpawnProcessHelper(); StartSpawnProcessHelper();
if (send(l_ProcessControlFD, jrequest.CStr(), jrequest.GetLength(), 0) < 0) { if (send(l_ProcessControlFD, jrequest.CStr(), jrequest.GetLength(), 0) < 0)
BOOST_THROW_EXCEPTION(posix_error() goto send_message;
<< boost::errinfo_api_function("send")
<< boost::errinfo_errno(errno));
}
char buf[4096]; char buf[4096];
@ -476,14 +464,12 @@ static int ProcessWaitPID(pid_t pid, int *status)
boost::mutex::scoped_lock lock(l_ProcessControlMutex); boost::mutex::scoped_lock lock(l_ProcessControlMutex);
while (send(l_ProcessControlFD, &length, sizeof(size_t), 0) < 0) send_message:
while (send(l_ProcessControlFD, &length, sizeof(length), 0) < 0)
StartSpawnProcessHelper(); StartSpawnProcessHelper();
if (send(l_ProcessControlFD, jrequest.CStr(), jrequest.GetLength(), 0) < 0) { if (send(l_ProcessControlFD, jrequest.CStr(), jrequest.GetLength(), 0) < 0)
BOOST_THROW_EXCEPTION(posix_error() goto send_message;
<< boost::errinfo_api_function("send")
<< boost::errinfo_errno(errno));
}
char buf[4096]; char buf[4096];