Explictly cast calculation to int, to allow std::min to work. #2695
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
ACK |
|
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/03f498080a813850e1a3addf2c555450aa5e65c1 for binaries and test log. |
|
ACK |
sipa
added a commit
that referenced
this pull request
May 30, 2013
Explictly cast calculation to int, to allow std::min to work.
| @@ -530,7 +530,7 @@ bool AppInit2(boost::thread_group& threadGroup) | |||
| // Make sure enough file descriptors are available | |||
| int nBind = std::max((int)mapArgs.count("-bind"), 1); | |||
| nMaxConnections = GetArg("-maxconnections", 125); | |||
| nMaxConnections = std::max(std::min(nMaxConnections, FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS), 0); | |||
| nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0); | |||
There was a problem hiding this comment.
This looks like it will create problems if nBind+MIN_CORE_FILEDESCRIPTORS are > FD_SETSIZE...
Not that I see any reason someone should bind more than 1024 ports...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When compiling on FreeBSD, the calculation here returns an unsigned int. This causes a compile-time error with std::min, which cannot compare signed with unsigned integers.
This pull inserts an explicit cast, treating the calculated value as signed, keeping the compiler happy.