mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-02-12 09:17:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Make regression with .UNSANDBOXED

Browse source
This commit is contained in:
Justine Tunney 2022-08-10 17:06:59 -07:00
parent 37ebd8f8d5
commit e015defa70
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
third_party/make/job.c vendored
View file

@ -1680,6 +1680,11 @@ pid_t
child_execute_job (struct childbase *child, int good_stdin, char **argv) child_execute_job (struct childbase *child, int good_stdin, char **argv)
{ {
const int fdin = good_stdin ? FD_STDIN : get_bad_stdin (); const int fdin = good_stdin ? FD_STDIN : get_bad_stdin ();
struct dep *d;
struct child *c;
char pathbuf[PATH_MAX];
char outpathbuf[PATH_MAX];
const struct variable *var;
int fdout = FD_STDOUT; int fdout = FD_STDOUT;
int fderr = FD_STDERR; int fderr = FD_STDERR;
pid_t pid; pid_t pid;
@ -1714,22 +1719,17 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv)
if (fderr != FD_STDERR) if (fderr != FD_STDERR)
EINTRLOOP (r, dup2 (fderr, FD_STDERR)); EINTRLOOP (r, dup2 (fderr, FD_STDERR));
/* resolve command into executable path */
argv[0] = commandv (argv[0], pathbuf, sizeof (pathbuf));
/* [jart] sandbox command based on prerequisites */ /* [jart] sandbox command based on prerequisites */
intptr_t loc = (intptr_t)child; /* we can cast if it's on the heap ;_; */ intptr_t loc = (intptr_t)child; /* we can cast if it's on the heap ;_; */
if (!(GetStackAddr() < loc && loc < GetStackAddr() + GetStackSize())) { if (!(GetStackAddr() < loc && loc < GetStackAddr() + GetStackSize())) {
struct dep *d;
struct child *c;
char pathbuf[PATH_MAX];
char outpathbuf[PATH_MAX];
const struct variable *var;
c = (struct child *)child; c = (struct child *)child;
errno = 0; errno = 0;
if (!lookup_variable_in_set (STRING_SIZE_TUPLE(".UNSANDBOXED"), if (!lookup_variable_in_set (STRING_SIZE_TUPLE(".UNSANDBOXED"),
c->file->variables->set)) c->file->variables->set))
{ {
/* resolve command into executable path */
argv[0] = commandv (argv[0], pathbuf, sizeof (pathbuf));
if (argv[0][0] == '/' && IsDynamicExecutable (argv[0])) if (argv[0][0] == '/' && IsDynamicExecutable (argv[0]))
{ {
/* /*