tor

commit 13024c79328ac29a037aeb8d6d4d3325068bd167
parent 15fddaffd59ab335ad7da5509889cdf2ca48047c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  5 Jul 2017 15:57:09 -0400

Merge branch 'maint-0.3.1'

Diffstat:
M
src/common/compat.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/compat.c b/src/common/compat.c
@@ -1733,7 +1733,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
     int bad = 1;
 #ifdef OPEN_MAX
     uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER;
-    if (errno == EINVAL && try_limit < rlim.rlim_cur) {
+    if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) {
       /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is
        * full of nasty lies.  I'm looking at you, OSX 10.5.... */
       rlim.rlim_cur = try_limit;