Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into topic/jsiwek/coverity

Browse source
This commit is contained in:
Jon Siwek 2013-09-23 14:55:46 -05:00
commit 9c2a3124e0
21 changed files with 423 additions and 3428 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Expr.cc
View file

@ -2442,7 +2442,7 @@ RefExpr::RefExpr(Expr* arg_op) : UnaryExpr(EXPR_REF, arg_op)
if ( IsError() )
return;
if ( ! is_assignable(op->Type()) )
if ( ! ::is_assignable(op->Type()) )
ExprError("illegal assignment target");
else
SetType(op->Type()->Ref());

20
src/input/readers/Raw.cc
View file

@ -73,15 +73,15 @@ void Raw::DoClose()
if ( execute && childpid > 0 && kill(childpid, 0) == 0 )
{
// kill child process
kill(childpid, SIGTERM);
// Kill child process group.
kill(-childpid, SIGTERM);
if ( forcekill )
{
usleep(200); // 200 msecs should be enough for anyone ;)
if ( kill(childpid, 0) == 0 ) // perhaps it is already gone
kill(childpid, SIGKILL);
kill(-childpid, SIGKILL);
}
}
}
@ -146,6 +146,11 @@ bool Raw::Execute()
else if ( childpid == 0 )
{
// we are the child.
// Obtain a process group w/ child's PID.
if ( setpgid(0, 0) == -1 )
_exit(251);
close(pipes[stdout_in]);
if ( dup2(pipes[stdout_out], stdout_fileno) == -1 )
_exit(252);
@ -180,6 +185,15 @@ bool Raw::Execute()
else
{
// we are the parent
// Parent also sets child process group immediately to avoid a race.
if ( setpgid(childpid, childpid) == -1 )
{
char buf[256];
strerror_r(errno, buf, sizeof(buf));
Warning(Fmt("Could not set child process group: %s", buf));
}
if ( ! UnlockForkMutex() )
return false;