From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Mon, 9 Feb 2015 01:58:22 +0000 (+0000)
Subject: Return 0 when detecting the amount of memory fails
X-Git-Tag: tor-0.2.6.3-alpha~63^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ae321db66cf83453b34c75d889599ea4a75642b;p=thirdparty%2Ftor.git

Return 0 when detecting the amount of memory fails

Fixes bug 14802;  bugfix on 0.2.5.4-alpha.
---

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 e25ecc462d..3eda1ca00d 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -3517,7 +3517,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;