Skip to content

Fix a crash on startup when ulimits are set to unlimited. #1615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cassandras-lies wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −6
Open

Fix a crash on startup when ulimits are set to unlimited. #1615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ static CDSNotificationInterface* pdsNotificationInterface = NULL;
// accessing block files don't count towards the fd_set size limit
// anyway.
#define MIN_CORE_FILEDESCRIPTORS 0
#define rlim_t unsigned long long
#else
#include <sys/resource.h>
#define MIN_CORE_FILEDESCRIPTORS 150
#endif

Expand Down Expand Up @@ -598,7 +600,7 @@ std::string LicenseInfo()
const std::string URL_WEBSITE = "<https://firo.org/>";

std::string copyright = CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2016, COPYRIGHT_YEAR) + " ");

const std::string bitcoinStr = strprintf("%i-%i The Bitcoin Core", 2016, COPYRIGHT_YEAR);
if (copyright.find(bitcoinStr) != std::string::npos) {
copyright.replace(copyright.find(bitcoinStr), sizeof("2016") - 1, "2009");
Expand Down Expand Up @@ -1070,9 +1072,9 @@ void InitLogging() {
namespace { // Variables internal to initialization process only

ServiceFlags nRelevantServices = NODE_NETWORK;
int nMaxConnections;
int nUserMaxConnections;
int nFD;
rlim_t nMaxConnections;
rlim_t nUserMaxConnections;
rlim_t nFD;
ServiceFlags nLocalServices = NODE_NETWORK;

}
Expand Down Expand Up @@ -1168,10 +1170,10 @@ bool AppInitParameterInteraction()
(mapMultiArgs.count("-bind") ? mapMultiArgs.at("-bind").size() : 0) +
(mapMultiArgs.count("-whitebind") ? mapMultiArgs.at("-whitebind").size() : 0), size_t(1));
nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
nMaxConnections = std::max(nUserMaxConnections, 0);
nMaxConnections = std::max(nUserMaxConnections, (rlim_t)0);

// Trim requested connection counts, to fit into system limitations
nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS)), 0);
nMaxConnections = std::max(std::min(nMaxConnections, (rlim_t)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS)), (rlim_t)0);
nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS + MAX_ADDNODE_CONNECTIONS);
if (nFD < MIN_CORE_FILEDESCRIPTORS)
return InitError(_("Not enough file descriptors available."));
Expand Down
Loading