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@xxxxxxxxx>
---
src/parser.y | 4 ++--
src/rule.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/parser.y b/src/parser.y
index f6c9488..2050f8a 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;
diff --git a/src/rule.c b/src/rule.c
index 657695a..ab96e62 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -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;
--
1.8.5.3
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
