From: Roy Marples <roy@marples.name>
Date: Wed, 9 Jul 2014 04:40:53 +0000 (+0000)
Subject: Ensure iaid was previously set before testing equality.
X-Git-Tag: v6.4.1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8371b540b5a627276ab104709050c7a5bc41eba0;p=thirdparty%2Fdhcpcd.git

Ensure iaid was previously set before testing equality.
---

diff --git a/if-options.c b/if-options.c
index 7be4ea17..6fa4b12b 100644
--- a/if-options.c
+++ b/if-options.c
@@ -1253,7 +1253,8 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
 		ia = NULL;
 		for (sl = 0; sl < ifo->ia_len; sl++) {
 			if ((arg == NULL && !ifo->ia[sl].iaid_set) ||
-			    (ifo->ia[sl].iaid[0] == iaid[0] &&
+			    (ifo->ia[sl].iaid_set &&
+			    ifo->ia[sl].iaid[0] == iaid[0] &&
 			    ifo->ia[sl].iaid[1] == iaid[1] &&
 			    ifo->ia[sl].iaid[2] == iaid[2] &&
 			    ifo->ia[sl].iaid[3] == iaid[3]))