kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to…

kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to ullAvailPhys, ullTotalPageFile, and ullAvailPageFile.

kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to…
c91dd240 · Ken Thomases · Alexandre Julliard · 89a96db0 · c91dd240
Commit c91dd240 authored Feb 16, 2014 by Ken Thomases Committed by Alexandre Julliard Feb 17, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

heap.c dlls/kernel32/heap.c +7 -5

No files found.
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -1226,11 +1226,13 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex )
        lpmemex->ullTotalPhys = val;
    mib[1] = HW_USERMEM;
    size_sys = sizeof(val);
-    if (sysctl(mib, 2, &val, &size_sys, NULL, 0) || size_sys != sizeof(val) || !val)
-        val = lpmemex->ullTotalPhys;
-    lpmemex->ullAvailPhys = val;
-    lpmemex->ullTotalPageFile = val;
-    lpmemex->ullAvailPageFile = val;
+    if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val)
+        lpmemex->ullAvailPhys = val;
+    else
+        lpmemex->ullAvailPhys = lpmemex->ullTotalPhys;
+
+    lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys;
+    lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys;
 #elif defined ( sun )
    pagesize=sysconf(_SC_PAGESIZE);
    maxpages=sysconf(_SC_PHYS_PAGES);