commit 1a15cb7e904a562b0120039816fce5b8e6d5b147
author Jean-Baptiste Queru <jbq@google.com> Wed Nov 24 08:27:17 2010 -0800
committer Android Code Review <code-review@android.com> Wed Nov 24 08:27:17 2010 -0800
tree 3030f4630c22db03df61436cebda5a7fd81d0a26
parent 4906db21e041327042b87122b233e1f150618334
parent a9791e12852a23c762d42aaafa55473cf4a5ed20

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

init/parser.c

diff --git a/init/parser.c b/init/parser.c
index 7da0d19..ca03da9 100644
--- a/init/parser.c
+++ b/init/parser.c
@@ -800,6 +800,7 @@
     struct action *act = state->context;
     int (*func)(int nargs, char **args);
     int kw, n;
+    int alloc_size = 0;
 
     if (nargs == 0) {
         return;
@@ -817,7 +818,14 @@
             n > 2 ? "arguments" : "argument");
         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->nargs = nargs;
     memcpy(cmd->args, args, sizeof(char*) * nargs);