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
@@ -161,6 +188,8 @@ int command_default(struct iptables_command_state *cs,
 			struct option *existing;
 			struct option *old;
 
+			ensure_heap_opts(gl);
+
 			existing = gl->opts;
 			if (existing == NULL)
 				existing = gl->orig_opts;
@@ -555,6 +584,8 @@ void command_match(struct iptables_command_state *cs)
 	struct xtables_match *m;
 	size_t size;
 
+	ensure_heap_opts(xt_params);
+
 	existing = xt_params->opts;
 	if (existing == NULL)
 		existing = xt_params->orig_opts;
@@ -623,6 +654,8 @@ void command_jump(struct iptables_command_state *cs)
 	struct option *opts;
 	size_t size;
 
+	ensure_heap_opts(xt_params);
+
 	existing = xt_params->opts;
 	if (existing == NULL)
 		existing = xt_params->orig_opts;