diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2016-12-19 08:48:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 08:48:44 +0100 |
| commit | 2988889db141b5d691ac94e0b64b37884030dea8 (patch) | |
| tree | 410b19d18e3c182da0844a8a2de0ace47a2bb7d3 | |
| parent | ce9e36eb01f1b9122ceedc61f00d08ed0a4cfb97 (diff) | |
| parent | a1a07225b3963eb251b518737a3f6b59515faaa1 (diff) | |
| download | redis-2988889db141b5d691ac94e0b64b37884030dea8.tar.gz | |
Merge pull request #3603 from oranagra/adjustOpenFilesLimit_overflow
fix unsigned int overflow in adjustOpenFilesLimit
| -rw-r--r-- | src/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server.c b/src/server.c index 0dc62c2b0..3d5e29bed 100644 --- a/src/server.c +++ b/src/server.c @@ -1575,9 +1575,9 @@ void adjustOpenFilesLimit(void) { if (bestlimit < oldlimit) bestlimit = oldlimit; if (bestlimit < maxfiles) { - int old_maxclients = server.maxclients; - server.maxclients = bestlimit-CONFIG_MIN_RESERVED_FDS; - if (server.maxclients < 1) { + unsigned int old_maxclients = server.maxclients; + server.maxclients = bestlimit-CONFIG_MIN_RESERVED_FDS; /* NOTICE: server.maxclients is unsigned */ + if (bestlimit <= CONFIG_MIN_RESERVED_FDS) { serverLog(LL_WARNING,"Your current 'ulimit -n' " "of %llu is not enough for the server to start. " "Please increase your open file limit to at least " |