From: Steven Barth <steven@midlink.org>
Date: Mon, 30 Dec 2013 17:33:25 +0000 (+0100)
Subject: Fix compilation and cleanup
X-Git-Tag: debian/1.1+git20160131-1~106
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=2967807d6c9ea297a97b79c9b98e7b361d948e56

Fix compilation and cleanup
---

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 7fdf4f6..9bc03ea 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -564,9 +564,9 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
 		return false;
 	}
 
-	uint8_t *end = ((uint8_t*)buf) + len, *odata,
+	uint8_t *end = ((uint8_t*)buf) + len, *odata = NULL,
 		rcmsg = DHCPV6_MSG_UNKNOWN;
-	uint16_t otype, olen;
+	uint16_t otype, olen = UINT16_MAX;
 	bool clientid_ok = false, serverid_ok = false, rcauth_ok = false,
 		ia_present = false, options_valid = true;
 
@@ -1259,7 +1259,7 @@ static void dhcpv6_add_server_cand(const struct dhcpv6_server_cand *cand)
 	// Remove identical duid server candidate
 	for (i = 0; i < cand_len / sizeof(*c); ++i) {
 		if (cand->duid_len == c[i].duid_len &&
-			!memcmp(cand->duid, c[i].duid, cand->duid_len)) {
+				!memcmp(cand->duid, c[i].duid, cand->duid_len)) {
 			free(c[i].ia_na);
 			free(c[i].ia_pd);
 			odhcp6c_remove_state(STATE_SERVER_CAND, i * sizeof(*c), sizeof(*c));
@@ -1283,10 +1283,8 @@ static void dhcpv6_clear_all_server_cand(void)
 
 	// Server candidates need deep delete for IA_NA/IA_PD
 	for (i = 0; i < cand_len / sizeof(*c); ++i) {
-		if (c[i].ia_na)
-			free(c[i].ia_na);
-		if (c[i].ia_pd)
-			free(c[i].ia_pd);
+		free(c[i].ia_na);
+		free(c[i].ia_pd);
 	}
 	odhcp6c_clear_state(STATE_SERVER_CAND);
 }