...

Author: splitice

ipthelper/ip6tables.c

@@ -1442,7 +1442,7 @@ int do_command6(int argc, char *argv[], char **table, void **handle)
 	opts = xt_params->orig_opts;
 	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) {
+					   xt_params->opts ?: opts, NULL)) != -1) {
 		switch (cs.c) {
 			/*
 			 * Command selection

ipthelper/iptables.c

@@ -1020,7 +1020,8 @@ int do_command4(int argc, char *argv[], char **table, void **handle)
 	iptables_globals.opts = iptables_globals.orig_opts;
 	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

ipthelper/xshared.c

@@ -571,6 +571,8 @@ void command_match(struct iptables_command_state *cs)
 	else if (m->extra_opts != NULL)
 		opts = xtables_merge_options(xt_params->orig_opts, opts,
 					     m->extra_opts, &m->option_offset);
+	else
+		return;
 	if (opts == NULL)
 		xtables_error(OTHER_PROBLEM, "can't alloc memory!");
 }
@@ -628,10 +630,12 @@ 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);
-	else
+	else if (cs->target->extra_opts != NULL)
 		opts = xtables_merge_options(xt_params->orig_opts, opts,
 					     cs->target->extra_opts,
 					     &cs->target->option_offset);
+	else
+		return;
 	if (opts == NULL)
 		xtables_error(OTHER_PROBLEM, "can't alloc memory!");
 	xt_params->opts = opts;