diff options
author | Patrick McHardy <kaber@trash.net> | 2014-02-05 19:03:40 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-02-05 19:09:46 +0000 |
commit | 782d57968590186e8f85b2310092d6008b00ac2c (patch) | |
tree | f038de56859b29b7491024823c5de47c591bf16b | |
parent | 4b85c9d6bb5beb210dd59c74144c1fb05fa5c020 (diff) |
cmd: initialize cmd list and use list_splice_tail() for adding to command list
With incremental evaluation we're first evaluating the command before
adding it to the global command list, so the command's list_head is
uninitialized during evaluation. We need to initialize it to handle the
case that an implicit set declaration will prepend a command to the list.
Also list_splice_tail() needs to be used instead of list_add_tail() to
add the entire list of commands.
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | src/parser.y | 4 | ||||
-rw-r--r-- | src/rule.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/parser.y b/src/parser.y index f6c9488a..2050f8a3 100644 --- a/src/parser.y +++ b/src/parser.y @@ -497,7 +497,7 @@ input : /* empty */ if (++state->nerrs == max_errors) YYABORT; } else - list_add_tail(&$2->list, &state->cmds); + list_splice_tail(&$2->list, &state->cmds); } } ; @@ -560,7 +560,7 @@ line : common_block { $$ = NULL; } if (++state->nerrs == max_errors) YYABORT; } else - list_add_tail(&$1->list, &state->cmds); + list_splice_tail(&$1->list, &state->cmds); } $$ = NULL; @@ -426,6 +426,7 @@ struct cmd *cmd_alloc(enum cmd_ops op, enum cmd_obj obj, struct cmd *cmd; cmd = xzalloc(sizeof(*cmd)); + init_list_head(&cmd->list); cmd->op = op; cmd->obj = obj; cmd->handle = *h; |