summaryrefslogtreecommitdiffstats
path: root/sys/contrib/ipfilter
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2014-09-22 16:45:28 +0000
committercy <cy@FreeBSD.org>2014-09-22 16:45:28 +0000
commit958f10bcdc11d50a48cd03045eacbe80b9d43d9f (patch)
tree813a11113e257f2edb44cb67f9cb3865bcac13ac /sys/contrib/ipfilter
parentdeb4e9e0ed82c6efacaecc28d0d175c8df4bf479 (diff)
downloadFreeBSD-src-958f10bcdc11d50a48cd03045eacbe80b9d43d9f.zip
FreeBSD-src-958f10bcdc11d50a48cd03045eacbe80b9d43d9f.tar.gz
Check for NULL before de-refencing; in particular sel is assigned to NULL,
in the default case, and then couple of lines down we do sel-> Approved by: glebius (mentor) Obtained from: NetBSD CVS repo (r1.5)
Diffstat (limited to 'sys/contrib/ipfilter')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_dstlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_dstlist.c b/sys/contrib/ipfilter/netinet/ip_dstlist.c
index ce2e72e..d516556 100644
--- a/sys/contrib/ipfilter/netinet/ip_dstlist.c
+++ b/sys/contrib/ipfilter/netinet/ip_dstlist.c
@@ -1134,7 +1134,7 @@ ipf_dstlist_select(fin, d)
int family;
int x;
- if (d->ipld_dests == NULL || *d->ipld_dests == NULL)
+ if (d == NULL || d->ipld_dests == NULL || *d->ipld_dests == NULL)
return NULL;
family = fin->fin_family;
@@ -1222,7 +1222,7 @@ ipf_dstlist_select(fin, d)
break;
}
- if (sel->ipfd_dest.fd_addr.adf_family != family)
+ if (sel && sel->ipfd_dest.fd_addr.adf_family != family)
sel = NULL;
d->ipld_selected = sel;
OpenPOWER on IntegriCloud