diff options
| -rw-r--r-- | iptables/xshared.c | 12 | ||||
| -rw-r--r-- | iptables/xtables-eb.c | 25 | ||||
| -rw-r--r-- | libxtables/xtables.c | 6 |
3 files changed, 24 insertions, 19 deletions
diff --git a/iptables/xshared.c b/iptables/xshared.c index 43fa929d..7d073891 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -798,6 +798,9 @@ static void command_match(struct iptables_command_state *cs, bool invert) else if (m->extra_opts != NULL) opts = xtables_merge_options(xt_params->orig_opts, opts, m->extra_opts, &m->option_offset); + else + return; + if (opts == NULL) xtables_error(OTHER_PROBLEM, "can't alloc memory!"); xt_params->opts = opts; @@ -856,10 +859,13 @@ void command_jump(struct iptables_command_state *cs, const char *jumpto) opts = xtables_options_xfrm(xt_params->orig_opts, opts, cs->target->x6_options, &cs->target->option_offset); - else + else if (cs->target->extra_opts != NULL) opts = xtables_merge_options(xt_params->orig_opts, opts, cs->target->extra_opts, &cs->target->option_offset); + else + return; + if (opts == NULL) xtables_error(OTHER_PROBLEM, "can't alloc memory!"); xt_params->opts = opts; @@ -1484,10 +1490,10 @@ void do_parse(int argc, char *argv[], demand-load a protocol. */ opterr = 0; - xt_params->opts = xt_params->orig_opts; while ((cs->c = getopt_long(argc, argv, optstring_lookup(afinfo->family), - xt_params->opts, NULL)) != -1) { + xt_params->opts ?: xt_params->orig_opts, + NULL)) != -1) { switch (cs->c) { /* * Command selection diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index d197b37e..51c699de 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -298,11 +298,14 @@ static void ebt_load_match(const char *name) xs_init_match(m); if (m->x6_options != NULL) - opts = xtables_options_xfrm(opts, NULL, + opts = xtables_options_xfrm(xt_params->orig_opts, opts, m->x6_options, &m->option_offset); else if (m->extra_opts != NULL) - opts = xtables_merge_options(opts, NULL, + opts = xtables_merge_options(xt_params->orig_opts, opts, m->extra_opts, &m->option_offset); + else + return; + if (opts == NULL) xtables_error(OTHER_PROBLEM, "Can't alloc memory"); xt_params->opts = opts; @@ -332,11 +335,16 @@ static void ebt_load_watcher(const char *name) xs_init_target(watcher); if (watcher->x6_options != NULL) - opts = xtables_options_xfrm(opts, NULL, watcher->x6_options, + opts = xtables_options_xfrm(xt_params->orig_opts, opts, + watcher->x6_options, &watcher->option_offset); else if (watcher->extra_opts != NULL) - opts = xtables_merge_options(opts, NULL, watcher->extra_opts, + opts = xtables_merge_options(xt_params->orig_opts, opts, + watcher->extra_opts, &watcher->option_offset); + else + return; + if (opts == NULL) xtables_error(OTHER_PROBLEM, "Can't alloc memory"); xt_params->opts = opts; @@ -344,7 +352,6 @@ static void ebt_load_watcher(const char *name) static void ebt_load_match_extensions(void) { - xt_params->opts = ebt_original_options; ebt_load_match("802_3"); ebt_load_match("arp"); ebt_load_match("ip"); @@ -358,10 +365,6 @@ static void ebt_load_match_extensions(void) ebt_load_watcher("log"); ebt_load_watcher("nflog"); - - /* assign them back so do_parse() may - * reset opts to orig_opts upon each call */ - xt_params->orig_opts = xt_params->opts; } void ebt_add_match(struct xtables_match *m, @@ -531,7 +534,6 @@ int nft_init_eb(struct nft_handle *h, const char *pname) void nft_fini_eb(struct nft_handle *h) { - struct option *opts = xt_params->opts; struct xtables_match *match; struct xtables_target *target; @@ -542,8 +544,7 @@ void nft_fini_eb(struct nft_handle *h) free(target->t); } - if (opts != ebt_original_options) - free(opts); + free(xt_params->opts); nft_fini(h); xtables_fini(); diff --git a/libxtables/xtables.c b/libxtables/xtables.c index 856bfae8..ae3ff25a 100644 --- a/libxtables/xtables.c +++ b/libxtables/xtables.c @@ -111,10 +111,8 @@ void basic_exit_err(enum xtables_exittype status, const char *msg, ...) void xtables_free_opts(int unused) { - if (xt_params->opts != xt_params->orig_opts) { - free(xt_params->opts); - xt_params->opts = NULL; - } + free(xt_params->opts); + xt_params->opts = NULL; } struct option *xtables_merge_options(struct option *orig_opts, |