From: Roy Marples <roy@marples.name>
Date: Sun, 10 May 2009 23:31:55 +0000 (+0000)
Subject: I stand corrected - ifa_addr can be NULL from getifaddrs(3)
X-Git-Tag: v5.0.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cbab2cf9b5fac8cf805bd9f4491d73cd5529671;p=thirdparty%2Fdhcpcd.git

I stand corrected - ifa_addr can be NULL from getifaddrs(3)
---

diff --git a/net.c b/net.c
index 77cd5fdd..c4e5f155 100644
--- a/net.c
+++ b/net.c
@@ -272,7 +272,7 @@ discover_interfaces(int argc, char * const *argv)
 
 	ifs = ifl = NULL;
 	for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) /* should not happen */
+		if (ifa->ifa_addr == NULL)
 			continue;
 #ifdef AF_LINK
 		if (ifa->ifa_addr->sa_family != AF_LINK)
@@ -374,9 +374,8 @@ do_address(const char *ifname,
 
 	retval = 0;
 	for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) /* should not happen */
-			continue;
-		if (ifa->ifa_addr->sa_family != AF_INET ||
+		if (ifa->ifa_addr == NULL ||
+		    ifa->ifa_addr->sa_family != AF_INET ||
 		    strcmp(ifa->ifa_name, ifname) != 0)
 			continue;
 		a = (const struct sockaddr_in *)(void *)ifa->ifa_addr;