nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sysrqb/bug14802_025'

Browse Source
This commit is contained in:
Nick Mathewson 2015-02-09 22:39:55 -08:00
commit 5c820def99
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug14802 Normal file
View File

@ -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.

2
src/common/compat.c
View File

@ -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;