diff options
| author | wtc%google.com <devnull@localhost> | 2011-06-02 02:05:00 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2011-06-02 02:05:00 +0000 |
| commit | dff5523cfc36dd29e38ba87617f71997be9624e5 (patch) | |
| tree | 6effeb9fc22918257c11cb7ab29c219b8baf2973 | |
| parent | 62693bba4bdf208850d98c37b75d2ed4740d2465 (diff) | |
| download | nspr-hg-dff5523cfc36dd29e38ba87617f71997be9624e5.tar.gz | |
Bug 661351: Handle errors in sysconf in PR_GetPhysicalMemorySize on AndroidNSPR_4_8_9_BETA3
2.2. The patch is contributed by Matt Brubeck <mbrubeck@mozilla.com>.
r=wtc.
| -rw-r--r-- | pr/src/misc/prsystem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pr/src/misc/prsystem.c b/pr/src/misc/prsystem.c index a93ad18b..073ae5d9 100644 --- a/pr/src/misc/prsystem.c +++ b/pr/src/misc/prsystem.c @@ -282,7 +282,8 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void) long pageSize = sysconf(_SC_PAGESIZE); long pageCount = sysconf(_SC_PHYS_PAGES); - bytes = (PRUint64) pageSize * pageCount; + if (pageSize >= 0 && pageCount >= 0) + bytes = (PRUint64) pageSize * pageCount; #elif defined(NETBSD) || defined(OPENBSD) |