Changeset 35691 in vbox for trunk/src

Timestamp:

Jan 24, 2011 4:59:46 PM (14 years ago)

Author:

vboxsync

Message:

Main/NetIf: Another attempt to fix VBoxSVC crash when listing host interfaces with no default route (#5491)

File:

• trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp (modified) (1 diff)

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

@@ -153 +153 @@
 
 #define ROUNDUP(a) \
-        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(u_long) - 1))) : sizeof(u_long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
+    (((a) & (sizeof(u_long) - 1)) ? (1 + ((a) | (sizeof(u_long) - 1))) : (a))
+#define ADVANCE(x, n) (x += (n)->sa_len ? ROUNDUP((n)->sa_len) : sizeof(u_long))
 
 void extractAddresses(int iAddrMask, caddr_t cp, caddr_t cplim, struct sockaddr **pAddresses)