Changeset 85274 in vbox for trunk/src/VBox/Main/src-server/darwin

Timestamp:

Jul 12, 2020 1:32:28 PM (5 years ago)

Author:

vboxsync

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

139251

Message:

Main/PerformanceDarwin.cpp: Signed/unsigned conversion issues w/ overflow aspects (>=4TiB). RTPROCESS vs pid_t. bugref:9790

File:

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

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

@@ -122 +122 @@
     {
         *total = totalRAM;
-        *available = cb / 1024;
+        cb /= 1024;
+        *available = cb < ~(ULONG)0 ? (ULONG)cb : ~(ULONG)0;
         *used = *total - *available;
     }
@@ -131 +132 @@
 {
     Log7(("getProcessInfo() getting info for %d", process));
-    int nb = proc_pidinfo(process, PROC_PIDTASKINFO, 0,  tinfo, sizeof(*tinfo));
-    if (nb <= 0)
+    int cbRet = proc_pidinfo((pid_t)process, PROC_PIDTASKINFO, 0, tinfo, sizeof(*tinfo));
+    if (cbRet <= 0)
     {
-        int rc = errno;
-        Log(("proc_pidinfo() -> %s", strerror(rc)));
-        return RTErrConvertFromDarwin(rc);
+        int iErrNo = errno;
+        Log(("proc_pidinfo() -> %s", strerror(iErrNo)));
+        return RTErrConvertFromDarwin(iErrNo);
     }
-    else if ((unsigned int)nb < sizeof(*tinfo))
+    if ((unsigned int)cbRet < sizeof(*tinfo))
     {
-        Log(("proc_pidinfo() -> too few bytes %d", nb));
+        Log(("proc_pidinfo() -> too few bytes %d", cbRet));
         return VERR_INTERNAL_ERROR;
     }
@@ -171 +172 @@
     if (RT_SUCCESS(rc))
     {
-        *used = tinfo.pti_resident_size / 1024;
+        uint64_t cKbResident = tinfo.pti_resident_size / 1024;
+        *used = cKbResident < ~(ULONG)0 ? (ULONG)cKbResident : ~(ULONG)0;
     }
     return rc;