]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
I stand corrected - ifa_addr can be NULL from getifaddrs(3)
authorRoy Marples <roy@marples.name>
Sun, 10 May 2009 23:31:55 +0000 (23:31 +0000)
committerRoy Marples <roy@marples.name>
Sun, 10 May 2009 23:31:55 +0000 (23:31 +0000)
net.c

diff --git a/net.c b/net.c
index 77cd5fdd8363a1dac4c24fd8c64a34f789d3f8d0..c4e5f155d2a290dcab7d2c6f1b73d4cb28205fbf 100644 (file)
--- 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;