diff options
| author |   krw <krw@openbsd.org> | 2019-01-14 02:51:29 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2019-01-14 02:51:29 +0000 |
| commit | 5b04ec9b47e15166037158b52f8d8f4bbaff116d (patch) | |
| tree | 2fee0d8150b718f7fa94e6e727337c1facf3952d | |
| parent | hint that kern.clockrate is the userland sysctl name by referring to (diff) | |
| download | wireguard-openbsd-5b04ec9b47e15166037158b52f8d8f4bbaff116d.tar.xz wireguard-openbsd-5b04ec9b47e15166037158b52f8d8f4bbaff116d.zip | |
Check NULLness of ignore list inside apply_ignore_list() and not
before calling it.
| -rw-r--r-- | sbin/dhclient/clparse.c | 5 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 9490d47e579..05a658b5678 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.172 2019/01/13 23:15:31 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.173 2019/01/14 02:51:29 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -850,6 +850,9 @@ apply_ignore_list(char *ignore_list) char *p; int ix, i, j; + if (ignore_list == NULL) + return; + memset(list, 0, sizeof(list)); ix = 0; diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index d1514b66a13..2a99dde17ff 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.603 2019/01/13 23:15:31 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.604 2019/01/14 02:51:29 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -600,10 +600,7 @@ main(int argc, char *argv[]) _PATH_LEASE_DB, ifi->name) == -1) fatal("path_lease_db"); - /* 2nd stage (post fork) config setup. */ - if (ignore_list != NULL) - apply_ignore_list(ignore_list); - + apply_ignore_list(ignore_list); read_resolv_conf_tail(); interface_state(ifi); |