summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjca <jca@openbsd.org>2017-07-26 18:16:21 +0000
committerjca <jca@openbsd.org>2017-07-26 18:16:21 +0000
commita35ab7b4d57796eaafb6f0b82764195bd33f8906 (patch)
treec39176db6a96fdd5a700d13caab474d4c4ae0b18
parentLocal declaration beautification. (diff)
downloadwireguard-openbsd-a35ab7b4d57796eaafb6f0b82764195bd33f8906.tar.xz
wireguard-openbsd-a35ab7b4d57796eaafb6f0b82764195bd33f8906.zip
Check the option length, not its address (which will never be NULL)
Spotted by clang, ok krw@
-rw-r--r--sbin/dhclient/dhclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index e4403c0b2d7..bbc7bf583c8 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.485 2017/07/26 16:53:22 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.486 2017/07/26 18:16:21 jca Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -1878,7 +1878,7 @@ lease_as_proposal(struct client_lease *lease)
} else
log_warnx("DOMAIN_NAME too long");
}
- if (&lease->options[DHO_DOMAIN_NAME_SERVERS].len != 0) {
+ if (lease->options[DHO_DOMAIN_NAME_SERVERS].len != 0) {
int servers;
opt = &lease->options[DHO_DOMAIN_NAME_SERVERS];
servers = opt->len / sizeof(struct in_addr);