summaryrefslogtreecommitdiffstats
path: root/iptables.c
diff options
context:
space:
mode:
Diffstat (limited to 'iptables.c')
-rw-r--r--iptables.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/iptables.c b/iptables.c
index b894f6a..78ac13c 100644
--- a/iptables.c
+++ b/iptables.c
@@ -853,6 +853,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++);