ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[PATCH] Init - make sure the last parameter to execve is NULL"

Browse source
This commit is contained in:
Jean-Baptiste Queru 2010-11-24 08:27:17 -08:00 • committed by Android Code Review
commit 1a15cb7e90
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
init/parser.c
View file

@ -800,6 +800,7 @@ static void parse_line_action(struct parse_state* state, int nargs, char **args)
struct action *act = state->context; struct action *act = state->context;
int (*func)(int nargs, char **args); int (*func)(int nargs, char **args);
int kw, n; int kw, n;
int alloc_size = 0;
if (nargs == 0) { if (nargs == 0) {
return; return;
@ -817,7 +818,14 @@ static void parse_line_action(struct parse_state* state, int nargs, char **args)
n > 2 ? "arguments" : "argument"); n > 2 ? "arguments" : "argument");
return; return;
} }
cmd = malloc(sizeof(*cmd) + sizeof(char*) * nargs); alloc_size = sizeof(*cmd) + sizeof(char*) * (nargs + 1);
cmd = malloc(alloc_size);
if (!cmd) {
parse_error(state, "malloc failed\n");
return;
}
memset((char *)cmd, 0, alloc_size);
cmd->func = kw_func(kw); cmd->func = kw_func(kw);
cmd->nargs = nargs; cmd->nargs = nargs;
memcpy(cmd->args, args, sizeof(char*) * nargs); memcpy(cmd->args, args, sizeof(char*) * nargs);