Revert "iptables-restore: move code to add_param_to_argv, cleanup (fix gcc-4.7)"

This reverts commit 44191bdbd71e685fba9eab864b9df25e63905220.

Apply instead a patch that really clarifies the bug in iptables-restore.
This should be good for the record (specifically, for distributors so
they can find the fix by googling).

diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c
index 9a03dff439ac1e485f9f01db5d14d3108eb3b7b7..3894d68d91b178e125315c14eeb177f3b9a4545d 100644 (file)
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
@@ -114,70 +114,6 @@ static void free_argv(void) {
                free(newargv[i]);
 }
 
-static void add_param_to_argv(char *parsestart)
-{
-       int quote_open = 0, escaped = 0, param_len = 0;
-       char param_buffer[1024], *curchar;
-
-       /* After fighting with strtok enough, here's now
-        * a 'real' parser. According to Rusty I'm now no
-        * longer a real hacker, but I can live with that */
-
-       for (curchar = parsestart; *curchar; curchar++) {
-               if (quote_open) {
-                       if (escaped) {
-                               param_buffer[param_len++] = *curchar;
-                               escaped = 0;
-                               continue;
-                       } else if (*curchar == '\\') {
-                               escaped = 1;
-                               continue;
-                       } else if (*curchar == '"') {
-                               quote_open = 0;
-                               *curchar = ' ';
-                       } else {
-                               param_buffer[param_len++] = *curchar;
-                               continue;
-                       }
-               } else {
-                       if (*curchar == '"') {
-                               quote_open = 1;
-                               continue;
-                       }
-               }
-
-               if (*curchar == ' '
-                   || *curchar == '\t'
-                   || * curchar == '\n') {
-                       if (!param_len) {
-                               /* two spaces? */
-                               continue;
-                       }
-
-                       param_buffer[param_len] = '\0';
-
-                       /* check if table name specified */
-                       if (!strncmp(param_buffer, "-t", 2)
-                            || !strncmp(param_buffer, "--table", 8)) {
-                               xtables_error(PARAMETER_PROBLEM,
-                                  "Line %u seems to have a "
-                                  "-t table option.\n", line);
-                               exit(1);
-                       }
-
-                       add_argv(param_buffer);
-                       param_len = 0;
-               } else {
-                       /* regular character, copy to buffer */
-                       param_buffer[param_len++] = *curchar;
-
-                       if (param_len >= sizeof(param_buffer))
-                               xtables_error(PARAMETER_PROBLEM,
-                                  "Parameter too long!");
-               }
-       }
-}
-
 int ip6tables_restore_main(int argc, char *argv[])
 {
        struct xtc_handle *handle = NULL;
@@ -389,6 +325,11 @@ int ip6tables_restore_main(int argc, char *argv[])
                        char *bcnt = NULL;
                        char *parsestart;
 
+                       /* the parser */
+                       char *curchar;
+                       int quote_open, escaped;
+                       size_t param_len;
+
                        /* reset the newargv */
                        newargc = 0;
 
@@ -429,7 +370,69 @@ int ip6tables_restore_main(int argc, char *argv[])
                                add_argv((char *) bcnt);
                        }
 
-                       add_param_to_argv(parsestart);
+                       /* After fighting with strtok enough, here's now
+                        * a 'real' parser. According to Rusty I'm now no
+                        * longer a real hacker, but I can live with that */
+
+                       quote_open = 0;
+                       escaped = 0;
+                       param_len = 0;
+
+                       for (curchar = parsestart; *curchar; curchar++) {
+                               char param_buffer[1024];
+
+                               if (quote_open) {
+                                       if (escaped) {
+                                               param_buffer[param_len++] = *curchar;
+                                               escaped = 0;
+                                               continue;
+                                       } else if (*curchar == '\\') {
+                                               escaped = 1;
+                                               continue;
+                                       } else if (*curchar == '"') {
+                                               quote_open = 0;
+                                               *curchar = ' ';
+                                       } else {
+                                               param_buffer[param_len++] = *curchar;
+                                               continue;
+                                       }
+                               } else {
+                                       if (*curchar == '"') {
+                                               quote_open = 1;
+                                               continue;
+                                       }
+                               }
+
+                               if (*curchar == ' '
+                                   || *curchar == '\t'
+                                   || * curchar == '\n') {
+                                       if (!param_len) {
+                                               /* two spaces? */
+                                               continue;
+                                       }
+
+                                       param_buffer[param_len] = '\0';
+
+                                       /* check if table name specified */
+                                       if (!strncmp(param_buffer, "-t", 2)
+                                            || !strncmp(param_buffer, "--table", 8)) {
+                                               xtables_error(PARAMETER_PROBLEM,
+                                                  "Line %u seems to have a "
+                                                  "-t table option.\n", line);
+                                               exit(1);
+                                       }
+
+                                       add_argv(param_buffer);
+                                       param_len = 0;
+                               } else {
+                                       /* regular character, copy to buffer */
+                                       param_buffer[param_len++] = *curchar;
+
+                                       if (param_len >= sizeof(param_buffer))
+                                               xtables_error(PARAMETER_PROBLEM,
+                                                  "Parameter too long!");
+                               }
+                       }
 
                        DEBUGP("calling do_command6(%u, argv, &%s, handle):\n",
                                newargc, curtable);

diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c
index c974cb37d9f659f7736e207217dcbdbd657500fe..034f9606a6b2605a021c66f8430fdc05ff0cbe69 100644 (file)
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
@@ -113,70 +113,6 @@ static void free_argv(void) {
                free(newargv[i]);
 }
 
-static void add_param_to_argv(char *parsestart)
-{
-       int quote_open = 0, escaped = 0, param_len = 0;
-       char param_buffer[1024], *curchar;
-
-       /* After fighting with strtok enough, here's now
-        * a 'real' parser. According to Rusty I'm now no
-        * longer a real hacker, but I can live with that */
-
-       for (curchar = parsestart; *curchar; curchar++) {
-               if (quote_open) {
-                       if (escaped) {
-                               param_buffer[param_len++] = *curchar;
-                               escaped = 0;
-                               continue;
-                       } else if (*curchar == '\\') {
-                               escaped = 1;
-                               continue;
-                       } else if (*curchar == '"') {
-                               quote_open = 0;
-                               *curchar = ' ';
-                       } else {
-                               param_buffer[param_len++] = *curchar;
-                               continue;
-                       }
-               } else {
-                       if (*curchar == '"') {
-                               quote_open = 1;
-                               continue;
-                       }
-               }
-
-               if (*curchar == ' '
-                   || *curchar == '\t'
-                   || * curchar == '\n') {
-                       if (!param_len) {
-                               /* two spaces? */
-                               continue;
-                       }
-
-                       param_buffer[param_len] = '\0';
-
-                       /* check if table name specified */
-                       if (!strncmp(param_buffer, "-t", 2)
-                           || !strncmp(param_buffer, "--table", 8)) {
-                               xtables_error(PARAMETER_PROBLEM,
-                                  "Line %u seems to have a "
-                                  "-t table option.\n", line);
-                               exit(1);
-                       }
-
-                       add_argv(param_buffer);
-                       param_len = 0;
-               } else {
-                       /* regular character, copy to buffer */
-                       param_buffer[param_len++] = *curchar;
-
-                       if (param_len >= sizeof(param_buffer))
-                               xtables_error(PARAMETER_PROBLEM,
-                                  "Parameter too long!");
-               }
-       }
-}
-
 int
 iptables_restore_main(int argc, char *argv[])
 {
@@ -389,6 +325,11 @@ iptables_restore_main(int argc, char *argv[])
                        char *bcnt = NULL;
                        char *parsestart;
 
+                       /* the parser */
+                       char *curchar;
+                       int quote_open, escaped;
+                       size_t param_len;
+
                        /* reset the newargv */
                        newargc = 0;
 
@@ -429,7 +370,69 @@ iptables_restore_main(int argc, char *argv[])
                                add_argv((char *) bcnt);
                        }
 
-                       add_param_to_argv(parsestart);
+                       /* After fighting with strtok enough, here's now
+                        * a 'real' parser. According to Rusty I'm now no
+                        * longer a real hacker, but I can live with that */
+
+                       quote_open = 0;
+                       escaped = 0;
+                       param_len = 0;
+
+                       for (curchar = parsestart; *curchar; curchar++) {
+                               char param_buffer[1024];
+
+                               if (quote_open) {
+                                       if (escaped) {
+                                               param_buffer[param_len++] = *curchar;
+                                               escaped = 0;
+                                               continue;
+                                       } else if (*curchar == '\\') {
+                                               escaped = 1;
+                                               continue;
+                                       } else if (*curchar == '"') {
+                                               quote_open = 0;
+                                               *curchar = ' ';
+                                       } else {
+                                               param_buffer[param_len++] = *curchar;
+                                               continue;
+                                       }
+                               } else {
+                                       if (*curchar == '"') {
+                                               quote_open = 1;
+                                               continue;
+                                       }
+                               }
+
+                               if (*curchar == ' '
+                                   || *curchar == '\t'
+                                   || * curchar == '\n') {
+                                       if (!param_len) {
+                                               /* two spaces? */
+                                               continue;
+                                       }
+
+                                       param_buffer[param_len] = '\0';
+
+                                       /* check if table name specified */
+                                       if (!strncmp(param_buffer, "-t", 2)
+                                           || !strncmp(param_buffer, "--table", 8)) {
+                                               xtables_error(PARAMETER_PROBLEM,
+                                                  "Line %u seems to have a "
+                                                  "-t table option.\n", line);
+                                               exit(1);
+                                       }
+
+                                       add_argv(param_buffer);
+                                       param_len = 0;
+                               } else {
+                                       /* regular character, copy to buffer */
+                                       param_buffer[param_len++] = *curchar;
+
+                                       if (param_len >= sizeof(param_buffer))
+                                               xtables_error(PARAMETER_PROBLEM,
+                                                  "Parameter too long!");
+                               }
+                       }
 
                        DEBUGP("calling do_command4(%u, argv, &%s, handle):\n",
                                newargc, curtable);