Changeset 73097 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 12, 2018 9:06:33 PM (7 years ago)

Author:

vboxsync

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

123672

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

Location:

trunk/src/VBox/Main/src-server

Files:

• darwin/NetIf-darwin.cpp (modified) (1 diff)
• darwin/iokit.cpp (modified) (2 diffs)
• freebsd/NetIf-freebsd.cpp (modified) (1 diff)
• generic/NetIf-generic.cpp (modified) (1 diff)
• solaris/PerformanceSolaris.cpp (modified) (1 diff)

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

@@ -342 +342 @@
                 break;
             }
-        PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_OFFSETOF(NETIFINFO, szName[cbNameLen]));
+        PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_UOFFSETOF_DYN(NETIFINFO, szName[cbNameLen]));
         if (!pNew)
         {

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

@@ -1549 +1549 @@
                 /* Create the device. */
                 size_t cbName = strlen(szName) + 1;
-                PDARWINDVD pNew = (PDARWINDVD)RTMemAlloc(RT_OFFSETOF(DARWINDVD, szName[cbName]));
+                PDARWINDVD pNew = (PDARWINDVD)RTMemAlloc(RT_UOFFSETOF_DYN(DARWINDVD, szName[cbName]));
                 if (pNew)
                 {
@@ -1777 +1777 @@
 
                         size_t cchName = strlen(szTmp);
-                        PDARWINETHERNIC pNew = (PDARWINETHERNIC)RTMemAlloc(RT_OFFSETOF(DARWINETHERNIC, szName[cchName + 1]));
+                        PDARWINETHERNIC pNew = (PDARWINETHERNIC)RTMemAlloc(RT_UOFFSETOF_DYN(DARWINETHERNIC, szName[cchName + 1]));
                         if (pNew)
                         {

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

@@ -260 +260 @@
 
         size_t cbNameLen = pSdl->sdl_nlen + 1;
-        PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_OFFSETOF(NETIFINFO, szName[cbNameLen]));
+        PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_UOFFSETOF_DYN(NETIFINFO, szName[cbNameLen]));
         if (!pNew)
         {

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

@@ -244 +244 @@
 
                     size_t cbNameLen = strlen(szBuf) + 1;
-                    PNETIFINFO pInfo = (PNETIFINFO)RTMemAllocZ(RT_OFFSETOF(NETIFINFO, szName[cbNameLen]));
+                    PNETIFINFO pInfo = (PNETIFINFO)RTMemAllocZ(RT_UOFFSETOF_DYN(NETIFINFO, szName[cbNameLen]));
                     if (!pInfo)
                         rc = VERR_NO_MEMORY;

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -308 +308 @@
         /* psinfo_t keeps growing, so only read what we need to maximize
          * cross-version compatibility. The structures are compatible. */
-        ssize_t cb = RT_OFFSETOF(psinfo_t, pr_rssize) + RT_SIZEOFMEMB(psinfo_t, pr_rssize);
+        ssize_t cb = RT_UOFFSETOF(psinfo_t, pr_rssize) + RT_SIZEOFMEMB(psinfo_t, pr_rssize);
         AssertCompile(RTASSERT_OFFSET_OF(psinfo_t, pr_rssize) > RTASSERT_OFFSET_OF(psinfo_t, pr_pid));
         if (read(h, &psinfo, cb) == cb)