fixing with new libxtables

Author: splitice

ipthelper/ip6tables.c

@@ -216,7 +216,6 @@ static const unsigned int inverse_for_options[NUMBER_OF_OPT] =
 	0,
 };
 
-#define opts iptables_globals.opts
 #define prog_name iptables_globals.program_name
 #define prog_vers iptables_globals.program_version
 /* A few hardcoded protocols for 'all' and in case the user has no
@@ -1439,10 +1438,27 @@ int do_command6(int argc, char *argv[], char **table, void **handle)
            demand-load a protocol. */
 	opterr = 0;
 
-	opts = xt_params->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",
-					   opts, NULL)) != -1) {
+	   iptables_globals.opts?: iptables_globals.orig_opts, NULL)) != -1) {
 		switch (cs.c) {
 			/*
 			 * Command selection
@@ -2017,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,10 +1017,28 @@ 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, NULL)) != -1) {
+	   iptables_globals.opts?: iptables_globals.orig_opts,
+				    NULL)) != -1) {
 		switch (cs.c) {
 			/*
 			 * Command selection
@@ -1523,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;
 }

ipthelper/xshared.c

@@ -643,23 +643,22 @@ void command_match(struct iptables_command_state *cs)
 		return;
 	/* Merge options for non-cloned matches */
 	{
-		bool merged = false;
 		size_t merge_start = xs_longopts_count(opts, NULL);
 
 		if (m->x6_options != NULL) {
 			opts = xtables_options_xfrm(xt_params->orig_opts, opts,
 					    m->x6_options, &m->option_offset);
-			merged = true;
 		} else if (m->extra_opts != NULL) {
 			opts = xtables_merge_options(xt_params->orig_opts, opts,
 					     m->extra_opts, &m->option_offset);
-			merged = true;
-		}
+		
+		} else
+			return;
 
 		if (opts == NULL)
 			xtables_error(OTHER_PROBLEM, "can't alloc memory!");
-		if (merged)
-			xs_validate_new_longopts(opts, merge_start,
+			
+		xs_validate_new_longopts(opts, merge_start,
 					     m->real_name != NULL ?
 					     m->real_name : m->name);
 	}
@@ -723,19 +722,16 @@ void command_jump(struct iptables_command_state *cs)
 			opts = xtables_options_xfrm(xt_params->orig_opts, opts,
 					    cs->target->x6_options,
 					    &cs->target->option_offset);
-			merged = true;
-		} else if (cs->target->extra_opts != NULL) {
-			opts = xtables_merge_options(xt_params->orig_opts, opts,
+	else if (cs->target->extra_opts != NULL)
+		opts = xtables_merge_options(xt_params->orig_opts, opts,
 					     cs->target->extra_opts,
 					     &cs->target->option_offset);
-			merged = true;
-		}
-		if (opts == NULL)
-			xtables_error(OTHER_PROBLEM, "can't alloc memory!");
-		if (merged)
-			xs_validate_new_longopts(opts, merge_start,
-					 cs->target->real_name != NULL ?
-					 cs->target->real_name : cs->jumpto);
-	}
+	else
+		return;
+	if (opts == NULL)
+		xtables_error(OTHER_PROBLEM, "can't alloc memory!");
+	xs_validate_new_longopts(opts, merge_start,
+				cs->target->real_name != NULL ?
+				cs->target->real_name : cs->jumpto);
 	xt_params->opts = opts;
 }