@@ -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
@@ -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
Old code in add_param_to_argv() assumed the input line would always end with a newline character. Without it, the last word of input wasn't recognized. Fix this by adding a final check for param.len (indicating leftover data in buffer). In line parsing code itself, only COMMIT line check required presence of trailing newline. The replaced conditional is not 100% accurate as it allows for characters after newline to be present, but since fgets() is used this shouldn't happen anyway. Signed-off-by: Phil Sutter <phil@nwl.cc> --- iptables/xshared.c | 4 ++++ iptables/xtables-restore.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-)