summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--iptables/xshared.c4
-rw-r--r--iptables/xtables-restore.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/iptables/xshared.c b/iptables/xshared.c
index 2a0077d9..16c58914 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -530,6 +530,10 @@ void add_param_to_argv(struct argv_store *store, char *parsestart, int line)
param.len = 0;
quoted = 0;
}
+ if (param.len) {
+ param.buffer[param.len] = '\0';
+ add_argv(store, param.buffer, 0);
+ }
}
#ifdef DEBUG
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index 83e05102..5a534ca2 100644
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -88,7 +88,9 @@ static void xtables_restore_parse_line(struct nft_handle *h,
if (verbose)
fputs(buffer, stdout);
return;
- } else if ((strcmp(buffer, "COMMIT\n") == 0) && state->in_table) {
+ } else if (state->in_table &&
+ (strncmp(buffer, "COMMIT", 6) == 0) &&
+ (buffer[6] == '\0' || buffer[6] == '\n')) {
if (!p->testing) {
/* Commit per table, although we support
* global commit at once, stick by now to