From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 May 2014 04:32:22 +0000 (-0400)
Subject: Return success when get_total_system_memory() succeeds.
X-Git-Tag: tor-0.2.5.5-alpha~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a32d7e1910176deef62583cef5d1195257bf3e17;p=thirdparty%2Ftor.git

Return success when get_total_system_memory() succeeds.

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

diff --git a/changes/bug11805 b/changes/bug11805
new file mode 100644
index 0000000000..02a5538948
--- /dev/null
+++ b/changes/bug11805
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Correctly detect the total available system memory. We tried to do this
+      in 0.2.5.4-alpha, but the code was set up to always return an error
+      value, even on success.
+      Fixes bug 11805; bugfix on 0.2.5.4-alpha. 
diff --git a/src/common/compat.c b/src/common/compat.c
index 974f697e34..7a444df106 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -3453,6 +3453,6 @@ get_total_system_memory(size_t *mem_out)
 
   *mem_out = mem_cached = (size_t) m;
 
-  return -1;
+  return 0;
 }