Update xshared.c

Author: splitice

ipthelper/xshared.c

@@ -18,6 +18,33 @@
 #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
@@ -157,6 +184,7 @@ 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,
@@ -539,6 +567,7 @@ 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 xtables_match *m;
 	size_t size;
@@ -564,16 +593,13 @@ void command_match(struct iptables_command_state *cs)
 	if (m == m->next)
 		return;
 	/* Merge options for non-cloned matches */
-	if (m->x6_options != NULL){
+	if (m->x6_options != NULL) {
 		opts = xtables_options_xfrm(xt_params->orig_opts, opts,
 					    m->x6_options, &m->option_offset);
-int num_orig;
-for (num_orig = 0; opts[num_orig].name != NULL; ++num_orig) {}
-
-	}
-	else if (m->extra_opts != NULL)
+	} else if (m->extra_opts != NULL) {
 		opts = xtables_merge_options(xt_params->orig_opts, opts,
 					     m->extra_opts, &m->option_offset);
+	}
 	if (opts == NULL)
 		xtables_error(OTHER_PROBLEM, "can't alloc memory!");
 	xt_params->opts = opts;
@@ -601,6 +627,7 @@ 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;
 	size_t size;