diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-09 22:39:55 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-09 22:39:55 -0800 |
| commit | 5c820def993cad85d18e887af74087163d769f04 (patch) | |
| tree | bd171301c04ce9bf3b3f8948d7a92c0a39f261dd | |
| parent | f4c0735933699d899bd31c4e938862bcec7fd64c (diff) | |
| parent | 9ae321db66cf83453b34c75d889599ea4a75642b (diff) | |
| download | tor-5c820def993cad85d18e887af74087163d769f04.tar.gz tor-5c820def993cad85d18e887af74087163d769f04.zip | |
Merge remote-tracking branch 'sysrqb/bug14802_025'
| -rw-r--r-- | changes/bug14802 | 4 | ||||
| -rw-r--r-- | src/common/compat.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug14802 b/changes/bug14802 new file mode 100644 index 0000000000..fc7cfd1873 --- /dev/null +++ b/changes/bug14802 @@ -0,0 +1,4 @@ + o Minor bugfix: + - Make an educated guess about how much memory the system has when our + detection functionality fails on some operating system. Fixes bug 14802; + bugfix on 0.2.5.4-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 5575316b2b..fde65d9d15 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3161,7 +3161,7 @@ get_total_system_memory_impl(void) size_t len = sizeof(memsize); int mib[2] = {CTL_HW, HW_USERMEM}; if (sysctl(mib,2,&memsize,&len,NULL,0)) - return -1; + return 0; return memsize; |