From d01454062d0265f118c1b721740997cb93ef8cdb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 Jul 2007 14:32:26 +0000 Subject: Makes it possible to omit extra_opts of matches/targets if unnecessary. (Jan Engelhardt ) A nice side effect is that merge_option() doesn't copy options in that case. --- ip6tables.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ip6tables.c') diff --git a/ip6tables.c b/ip6tables.c index 8f8c2c21..0f96981e 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++); -- cgit v1.2.3