Makes it possible to omit extra_opts of matches/targets if unnecessary.

(Jan Engelhardt <jengelh@gmx.de>)

A nice side effect is that merge_option() doesn't copy options in that case.

1 files changed, 3 insertions, 0 deletions

diff --git a/ip6tables.c b/ip6tables.c
index 8f8c2c2..0f96981 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -815,6 +815,9 @@ merge_options(struct option *oldopts, const struct option *newopts,
 	unsigned int num_old, num_new, i;
 	struct option *merge;
 
+	if (newopts == NULL)
+		return oldopts;
+
 	for (num_old = 0; oldopts[num_old].name; num_old++);
 	for (num_new = 0; newopts[num_new].name; num_new++);