Update xshared.c

Author: splitice

ipthelper/xshared.c

@@ -18,33 +18,6 @@
 #include <math.h>
 #include "xshared.h"
 
-static void ensure_heap_opts(struct xtables_globals *globals)
-{
-	struct option *orig;
-	size_t count;
-	struct option *copy;
-
-	if (globals == NULL)
-		return;
-
-	if (globals->opts == NULL)
-		globals->opts = globals->orig_opts;
-
-	orig = globals->orig_opts;
-	if (orig == NULL || globals->opts != orig)
-		return;
-
-	for (count = 0; orig[count].name != NULL; ++count)
-		;
-	copy = malloc(sizeof(*copy) * (count + 1));
-	if (copy == NULL)
-		xtables_error(RESOURCE_PROBLEM, "malloc");
-	memcpy(copy, orig, sizeof(*copy) * (count + 1));
-	globals->opts = copy;
-	if (xt_params == globals)
-		xt_params->opts = copy;
-}
-
 /*
  * Print out any special helps. A user might like to be able to add a --help
  * to the commandline, and see expected results. So we call help for all
@@ -184,17 +157,26 @@ int command_default(struct iptables_command_state *cs,
 		m->m->u.user.revision = m->revision;
 		xs_init_match(m);
 
-		ensure_heap_opts(gl);
-		if (m->x6_options != NULL)
-			gl->opts = xtables_options_xfrm(gl->orig_opts,
-							gl->opts,
+		{
+			struct option *existing;
+			struct option *old;
+
+			existing = gl->opts;
+			if (existing == NULL)
+				existing = gl->orig_opts;
+			old = (existing == gl->orig_opts) ? NULL : existing;
+
+			if (m->x6_options != NULL)
+				gl->opts = xtables_options_xfrm(gl->orig_opts,
+							old,
 							m->x6_options,
 							&m->option_offset);
-		else
-			gl->opts = xtables_merge_options(gl->orig_opts,
-							 gl->opts,
-							 m->extra_opts,
-							 &m->option_offset);
+			else
+				gl->opts = xtables_merge_options(gl->orig_opts,
+							old,
+							m->extra_opts,
+							&m->option_offset);
+		}
 		if (gl->opts == NULL)
 			xtables_error(OTHER_PROBLEM, "can't alloc memory!");
 		optind--;
@@ -567,14 +549,20 @@ void print_ifaces(const char *iniface, const char *outiface, uint8_t invflags,
 
 void command_match(struct iptables_command_state *cs)
 {
-	ensure_heap_opts(xt_params);
-	struct option *opts = xt_params->opts;
+	struct option *existing;
+	struct option *old;
+	struct option *opts;
 	struct xtables_match *m;
 	size_t size;
 
+	existing = xt_params->opts;
+	if (existing == NULL)
+		existing = xt_params->orig_opts;
+	opts = existing;
+
 	if (cs->invert)
 		xtables_error(PARAMETER_PROBLEM,
-			   "unexpected ! flag before --match");
+		   "unexpected ! flag before --match");
 
 	m = xtables_find_match(optarg, XTF_LOAD_MUST_SUCCEED, &cs->matches);
 	size = XT_ALIGN(sizeof(struct xt_entry_match)) + m->size;
@@ -592,13 +580,16 @@ void command_match(struct iptables_command_state *cs)
 	xs_init_match(m);
 	if (m == m->next)
 		return;
-	/* Merge options for non-cloned matches */
+
+	old = (existing == xt_params->orig_opts) ? NULL : existing;
 	if (m->x6_options != NULL) {
-		opts = xtables_options_xfrm(xt_params->orig_opts, opts,
-					    m->x6_options, &m->option_offset);
+		opts = xtables_options_xfrm(xt_params->orig_opts, old,
+				    m->x6_options, &m->option_offset);
 	} else if (m->extra_opts != NULL) {
-		opts = xtables_merge_options(xt_params->orig_opts, opts,
-					     m->extra_opts, &m->option_offset);
+		opts = xtables_merge_options(xt_params->orig_opts, old,
+				      m->extra_opts, &m->option_offset);
+	} else {
+		return;
 	}
 	if (opts == NULL)
 		xtables_error(OTHER_PROBLEM, "can't alloc memory!");
@@ -627,10 +618,16 @@ const char *xt_parse_target(const char *targetname)
 
 void command_jump(struct iptables_command_state *cs)
 {
-	ensure_heap_opts(xt_params);
-	struct option *opts = xt_params->opts;
+	struct option *existing;
+	struct option *old;
+	struct option *opts;
 	size_t size;
 
+	existing = xt_params->opts;
+	if (existing == NULL)
+		existing = xt_params->orig_opts;
+	opts = existing;
+
 	cs->jumpto = xt_parse_target(optarg);
 	/* TRY_LOAD (may be chain name) */
 	cs->target = xtables_find_target(cs->jumpto, XTF_TRY_LOAD);
@@ -655,14 +652,17 @@ void command_jump(struct iptables_command_state *cs)
 	cs->target->t->u.user.revision = cs->target->revision;
 	xs_init_target(cs->target);
 
+	old = (existing == xt_params->orig_opts) ? NULL : existing;
 	if (cs->target->x6_options != NULL)
-		opts = xtables_options_xfrm(xt_params->orig_opts, opts,
-					    cs->target->x6_options,
-					    &cs->target->option_offset);
+		opts = xtables_options_xfrm(xt_params->orig_opts, old,
+				    cs->target->x6_options,
+				    &cs->target->option_offset);
+	else if (cs->target->extra_opts != NULL)
+		opts = xtables_merge_options(xt_params->orig_opts, old,
+				    cs->target->extra_opts,
+				    &cs->target->option_offset);
 	else
-		opts = xtables_merge_options(xt_params->orig_opts, opts,
-					     cs->target->extra_opts,
-					     &cs->target->option_offset);
+		return;
 	if (opts == NULL)
 		xtables_error(OTHER_PROBLEM, "can't alloc memory!");
 	xt_params->opts = opts;