From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Jan 2018 14:06:32 +0000 (-0500)
Subject: Add a cast to avoid a signed/unsigned comparison
X-Git-Tag: tor-0.3.3.1-alpha~35^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0bfd5a659777688798722a20f894797a4f4b54f0;p=thirdparty%2Ftor.git

Add a cast to avoid a signed/unsigned comparison
---

diff --git a/src/common/compat.c b/src/common/compat.c
index a88e9b5145..4ac443c134 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1723,7 +1723,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
     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 = MIN(try_limit, rlim.rlim_cur);
+      rlim.rlim_cur = MIN((rlim_t) try_limit, rlim.rlim_cur);
       if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) {
         if (rlim.rlim_cur < (rlim_t)limit) {
           log_warn(LD_CONFIG, "We are limited to %lu file descriptors by "