...

Author: splitice

ipthelper/ip6tables.c

@@ -1438,7 +1438,24 @@ int do_command6(int argc, char *argv[], char **table, void **handle)
            demand-load a protocol. */
 	opterr = 0;
 
-	iptables_globals.opts = iptables_globals.orig_opts;
+	/* Create a malloc'd copy of orig_opts */
+	if (iptables_globals.opts == NULL) {
+		size_t num_opts = 0;
+		struct option *orig_opts = iptables_globals.orig_opts;
+		
+		/* Count the number of options (including the NULL terminator) */
+		while (orig_opts[num_opts].name != NULL) {
+			num_opts++;
+		}
+		num_opts++; /* Include the NULL terminator */
+		
+		/* Allocate memory and copy the options */
+		iptables_globals.opts = malloc(num_opts * sizeof(struct option));
+		if (iptables_globals.opts == NULL) {
+			xtables_error(OTHER_PROBLEM, "malloc failed for options array");
+		}
+		memcpy(iptables_globals.opts, iptables_globals.orig_opts, num_opts * sizeof(struct option));
+	}
 	while ((cs.c = getopt_long(argc, argv,
 	   "-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:bvnt:m:xc:g:46",
 	   iptables_globals.opts?: iptables_globals.orig_opts, NULL)) != -1) {
@@ -2016,5 +2033,11 @@ int do_command6(int argc, char *argv[], char **table, void **handle)
 	free(dmasks);
 	xtables_free_opts(1);
 
+	/* Free the malloc'd copy of opts if it was allocated */
+	if (iptables_globals.opts != iptables_globals.orig_opts) {
+		free(iptables_globals.opts);
+		iptables_globals.opts = NULL;
+	}
+
 	return ret;
 }

ipthelper/iptables.c

@@ -1017,7 +1017,24 @@ int do_command4(int argc, char *argv[], char **table, void **handle)
            demand-load a protocol. */
 	opterr = 0;
 
-	iptables_globals.opts = iptables_globals.orig_opts;
+	/* Create a malloc'd copy of orig_opts */
+	if (iptables_globals.opts == NULL) {
+		size_t num_opts = 0;
+		struct option *orig_opts = iptables_globals.orig_opts;
+		
+		/* Count the number of options (including the NULL terminator) */
+		while (orig_opts[num_opts].name != NULL) {
+			num_opts++;
+		}
+		num_opts++; /* Include the NULL terminator */
+		
+		/* Allocate memory and copy the options */
+		iptables_globals.opts = malloc(num_opts * sizeof(struct option));
+		if (iptables_globals.opts == NULL) {
+			xtables_error(OTHER_PROBLEM, "malloc failed for options array");
+		}
+		memcpy(iptables_globals.opts, iptables_globals.orig_opts, num_opts * sizeof(struct option));
+	}
 	while ((cs.c = getopt_long(argc, argv,
 	   "-:A:C:D:R:I:L::S::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:i:fbvnt:m:xc:g:46",
 	   iptables_globals.opts?: iptables_globals.orig_opts,
@@ -1524,5 +1541,11 @@ int do_command4(int argc, char *argv[], char **table, void **handle)
 	free(dmasks);
 	//xtables_free_opts(1);
 
+	/* Free the malloc'd copy of opts if it was allocated */
+	if (iptables_globals.opts != iptables_globals.orig_opts) {
+		free(iptables_globals.opts);
+		iptables_globals.opts = NULL;
+	}
+
 	return ret;
 }