Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxMemorySize type in Unix implementation of wxGetFreeMemory().

Browse Source 
This should avoid overflows on 32 bit systems with more than 2GB of RAM.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-14 12:40:24 +00:00
parent 390c0e19c9
commit 28f9670787
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/unix/utilsunx.cpp
View File

@@ -1177,7 +1177,7 @@ wxMemorySize wxGetFreeMemory()
FILE *fp = fopen("/proc/meminfo", "r"); FILE *fp = fopen("/proc/meminfo", "r");
if ( fp ) if ( fp )
{ {
long memFree = -1; wxMemorySize memFreeBytes = (wxMemorySize)-1;
char buf[1024]; char buf[1024];
if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) ) if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
@@ -1185,7 +1185,8 @@ wxMemorySize wxGetFreeMemory()
// /proc/meminfo changed its format in kernel 2.6 // /proc/meminfo changed its format in kernel 2.6
if ( wxPlatformInfo().CheckOSVersion(2, 6) ) if ( wxPlatformInfo().CheckOSVersion(2, 6) )
{ {
if ( sscanf(buf, "MemFree: %ld", &memFree) == 1 ) unsigned long memFree;
if ( sscanf(buf, "MemFree: %lu", &memFree) == 1 )
{ {
// We consider memory used by the IO buffers and cache as // We consider memory used by the IO buffers and cache as
// being "free" too as Linux aggressively uses free memory // being "free" too as Linux aggressively uses free memory
@@ -1206,19 +1207,24 @@ wxMemorySize wxGetFreeMemory()
} }
// values here are always expressed in kB and we want bytes // values here are always expressed in kB and we want bytes
memFree *= 1024; memFreeBytes = memFree;
memFreeBytes *= 1024;
} }
} }
else // Linux 2.4 (or < 2.6, anyhow) else // Linux 2.4 (or < 2.6, anyhow)
{ {
long memTotal, memUsed; long memTotal, memUsed, memFree;
sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree); if ( sscanf(buf, "Mem: %ld %ld %ld",
&memTotal, &memUsed, &memFree) == 3 )
{
memFreeBytes = memFree;
}
} }
} }
fclose(fp); fclose(fp);
return (wxMemorySize)memFree; return memFreeBytes;
} }
#elif defined(__SGI__) #elif defined(__SGI__)
struct rminfo realmem; struct rminfo realmem;