MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Collect va_list before fork

Browse Source
This commit is contained in:
topjohnwu 2017-08-27 02:17:37 +08:00
parent ecfa4aafc1
commit 764999704a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jni/utils/misc.c
View File

@ -239,6 +239,14 @@ static int v_exec_command(int err, int *fd, void (*cb)(void), const char *argv0,
} }
} }
// Collect va_list into vector
struct vector v;
vec_init(&v);
vec_push_back(&v, strdup(argv0));
for (void *arg = va_arg(argv, void*); arg; arg = va_arg(argv, void*))
vec_push_back(&v, strdup(arg));
vec_push_back(&v, NULL);
int pid = fork(); int pid = fork();
if (pid != 0) { if (pid != 0) {
if (fd && *fd < 0) { if (fd && *fd < 0) {
@ -246,11 +254,12 @@ static int v_exec_command(int err, int *fd, void (*cb)(void), const char *argv0,
*fd = pipefd[0]; *fd = pipefd[0];
close(pipefd[1]); close(pipefd[1]);
} }
vec_deep_destroy(&v);
return pid; return pid;
} }
// Don't affect the daemon if anything wrong happens // Don't return to the daemon if anything goes wrong
err_handler = do_nothing; err_handler = exit_proc;
if (cb) cb(); if (cb) cb();
@ -259,14 +268,6 @@ static int v_exec_command(int err, int *fd, void (*cb)(void), const char *argv0,
if (err) xdup2(writeEnd, STDERR_FILENO); if (err) xdup2(writeEnd, STDERR_FILENO);
} }
// Collect va_list into vector
struct vector v;
vec_init(&v);
vec_push_back(&v, (void *) argv0);
for (void *arg = va_arg(argv, void*); arg; arg = va_arg(argv, void*))
vec_push_back(&v, arg);
vec_push_back(&v, NULL);
execvp(argv0, (char **) vec_entry(&v)); execvp(argv0, (char **) vec_entry(&v));
PLOGE("execvp"); PLOGE("execvp");
return -1; return -1;