summaryrefslogtreecommitdiffstats
path: root/ip6tables.c
diff options
context:
space:
mode:
Diffstat (limited to 'ip6tables.c')
-rw-r--r--ip6tables.c3
1 files changed, 3 insertions, 0 deletions
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++);