Changeset 50566 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Feb 24, 2014 11:13:52 PM (11 years ago)

Author:

vboxsync

Message:

VBoxServiceVMInfo.cpp: Attempt at socket address length fix.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)

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

@@ -1157 +1157 @@
      *       interface will get multiple entries for one physical interface.
      */
-#ifdef RT_OS_OS2
+# ifdef RT_OS_OS2
     struct ifreq   *pPrevLinkAddr = NULL;
-#endif
+# endif
     struct ifreq   *pCur   = IfConf.ifc_req;
     size_t          cbLeft = IfConf.ifc_len;
@@ -1166 +1166 @@
         /* 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));
+# else
                            + RT_MAX(sizeof(struct sockaddr), pCur->ifr_addr.sa_len);
+# endif
         AssertBreak(cbCur <= cbLeft);
 
-#ifdef RT_OS_OS2
+# ifdef RT_OS_OS2
         /* On OS/2 we get the MAC address in the AF_LINK that the BSD 4.4 stack
            emits.  We boldly ASSUME these always comes first. */
@@ -1175 +1179 @@
             && ((struct sockaddr_dl *)&pCur->ifr_addr)->sdl_alen == 6)
             pPrevLinkAddr = pCur;
-#endif
+# endif
 
         /* Skip it if it's not the kind of address we're looking for. */