From: Patrick McHardy <kaber@trash.net>
Date: Wed, 5 Feb 2014 19:03:40 +0000 (+0000)
Subject: cmd: initialize cmd list and use list_splice_tail() for adding to command list
X-Git-Tag: v0.2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=782d57968590186e8f85b2310092d6008b00ac2c;p=thirdparty%2Fnftables.git

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>
---

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;
 
diff --git a/src/rule.c b/src/rule.c
index 657695a6..ab96e62e 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;