From: Roy Marples <roy@marples.name>
Date: Wed, 25 May 2016 13:50:05 +0000 (+0000)
Subject: Ensure mask and bcast as always set.
X-Git-Tag: v6.11.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f347e48b61c5dec851c04c37079902822ba8bcd;p=thirdparty%2Fdhcpcd.git

Ensure mask and bcast as always set.
---

diff --git a/if-bsd.c b/if-bsd.c
index d1b21955..1628a121 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -1377,12 +1377,19 @@ if_ifa(struct dhcpcd_ctx *ctx, const struct ifa_msghdr *ifam)
 	case AF_INET:
 	case 255: /* FIXME: Why 255? */
 	{
+		const struct sockaddr_in *sin;
 		struct in_addr addr, mask, bcast;
 		int flags;
 
-		COPYOUT(addr, rti_info[RTAX_IFA]);
-		COPYOUT(mask, rti_info[RTAX_NETMASK]);
-		COPYOUT(bcast, rti_info[RTAX_BRD]);
+		sin = (const void *)rti_info[RTAX_IFA];
+		addr.s_addr = sin != NULL && sin->sin_family == AF_INET ?
+		    sin->sin_addr.s_addr : INADDR_ANY;
+		sin = (const void *)rti_info[RTAX_NETMASK];
+		mask.s_addr = sin != NULL && sin->sin_family == AF_INET ?
+		    sin->sin_addr.s_addr : INADDR_ANY;
+		sin = (const void *)rti_info[RTAX_BRD];
+		bcast.s_addr = sin != NULL && sin->sin_family == AF_INET ?
+		    sin->sin_addr.s_addr : INADDR_ANY;
 		if (ifam->ifam_type == RTM_NEWADDR) {
 			if ((flags = if_addrflags(&addr, ifp)) == -1)
 				break;