diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-05 15:57:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-05 15:57:09 -0400 |
| commit | 13024c79328ac29a037aeb8d6d4d3325068bd167 (patch) | |
| tree | 4b9e03030592b08e1e87a71ccdbbb569f128eb7a /src | |
| parent | 15fddaffd59ab335ad7da5509889cdf2ca48047c (diff) | |
| parent | 9383fa3851a47e4db83bccdb923760e059ac7941 (diff) | |
| download | tor-13024c79328ac29a037aeb8d6d4d3325068bd167.tar.gz tor-13024c79328ac29a037aeb8d6d4d3325068bd167.zip | |
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index fb712f26d9..3bea626903 100644 --- 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; |