Changeset 35641 in vbox

Timestamp:

Jan 19, 2011 9:06:21 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69550

Message:

Main/NetIf: Fixed VBoxSVC crash when listing host interfaces with no default route (#5491)

File:

• trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp

@@ -153 +153 @@
 
 #define ROUNDUP(a) \
-        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
+        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(u_long) - 1))) : sizeof(u_long))
 #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
 
@@ -161 +161 @@
 
     for (int i = 0; i < RTAX_MAX && cp < cplim; i++) {
-        if (!(iAddrMask & (1 << i)))
-            continue;
-
-        sa = (struct sockaddr *)cp;
-
-        pAddresses[i] = sa;
-
-        ADVANCE(cp, sa);
+        if (iAddrMask & (1 << i))
+        {
+            sa = (struct sockaddr *)cp;
+
+            pAddresses[i] = sa;
+
+            ADVANCE(cp, sa);
+        }
+        else
+            pAddresses[i] = NULL;
     }
 }
@@ -249 +251 @@
             extractAddresses(pRtMsg->rtm_addrs, (char *)(pRtMsg + 1),
                              pRtMsg->rtm_msglen + (char *)pRtMsg, addresses);
-            if ((pRtMsg->rtm_addrs & RTA_DST))
+            if ((pRtMsg->rtm_addrs & RTA_DST)
+                && (pRtMsg->rtm_addrs & RTA_NETMASK))
             {
                 if (addresses[RTAX_DST]->sa_family != AF_INET)