From: Roy Marples <roy@marples.name>
Date: Fri, 6 May 2016 20:44:24 +0000 (+0000)
Subject: Check we actually have options allocated before adding commandline options.
X-Git-Tag: v6.11.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ea49b38463316f147f39490184be2f3a6b9aa9;p=thirdparty%2Fdhcpcd.git

Check we actually have options allocated before adding commandline options.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 2c38bc76..68b80537 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -592,12 +592,14 @@ configure_interface(struct interface *ifp, int argc, char **argv,
 
 	old = ifp->options ? ifp->options->mtime : 0;
 	dhcpcd_selectprofile(ifp, NULL);
+	if (ifp->options == NULL)
+		return;
 	add_options(ifp->ctx, ifp->name, ifp->options, argc, argv);
 	ifp->options->options |= options;
 	configure_interface1(ifp);
 
 	/* If the mtime has changed drop any old lease */
-	if (ifp->options && old != 0 && ifp->options->mtime != old) {
+	if (old != 0 && ifp->options->mtime != old) {
 		logger(ifp->ctx, LOG_WARNING,
 		    "%s: confile file changed, expiring leases", ifp->name);
 		dhcpcd_drop(ifp, 0);