Changeset 50567 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

Timestamp:

Feb 24, 2014 11:35:48 PM (11 years ago)

Author:

vboxsync

Message:

VBoxServiceVMInfo.cpp: 2nd attempt at socket address length fix.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -1165 +1165 @@
     {
         /* Figure the size of the current request. */
-        size_t const cbCur = RT_OFFSETOF(struct ifreq, ifr_addr)
-# ifdef SA_LEN
-                           + RT_MAX(sizeof(struct sockaddr), SA_LEN(pCur->ifr_addr));
+        size_t cbCur = RT_OFFSETOF(struct ifreq, ifr_addr);
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) /* No sa_len on this platforms. */
+        Assert(pCur->ifr_addr.sa_family == AF_INET);
+        cbCur += sizeof(struct sockaddr);
 # else
-                           + RT_MAX(sizeof(struct sockaddr), pCur->ifr_addr.sa_len);
+        cbCur += RT_MAX(sizeof(struct sockaddr), pCur->ifr_addr.sa_len);
 # endif
         AssertBreak(cbCur <= cbLeft);