sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: order of locks cs_wallet and cs_main in rpc/evo

Browse Source 
It also reduce scope of both locks
This commit is contained in:
Konstantin Akimov 2024-04-30 01:18:00 +07:00
parent c3f34dcd98
commit 10869fff3b
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rpc/evo.cpp
View File

@ -1372,7 +1372,6 @@ static UniValue protx_list(const JSONRPCRequest& request, CDeterministicMNManage
throw std::runtime_error("\"protx list wallet\" not supported when wallet is disabled"); throw std::runtime_error("\"protx list wallet\" not supported when wallet is disabled");
} }
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
LOCK2(wallet->cs_wallet, cs_main);
if (request.params.size() > 4) { if (request.params.size() > 4) {
protx_list_help(request); protx_list_help(request);
@ -1380,6 +1379,7 @@ static UniValue protx_list(const JSONRPCRequest& request, CDeterministicMNManage
bool detailed = !request.params[1].isNull() ? ParseBoolV(request.params[1], "detailed") : false; bool detailed = !request.params[1].isNull() ? ParseBoolV(request.params[1], "detailed") : false;
LOCK2(wallet->cs_wallet, cs_main);
int height = !request.params[2].isNull() ? ParseInt32V(request.params[2], "height") : chainman.ActiveChain().Height(); int height = !request.params[2].isNull() ? ParseInt32V(request.params[2], "height") : chainman.ActiveChain().Height();
if (height < 1 || height > chainman.ActiveChain().Height()) { if (height < 1 || height > chainman.ActiveChain().Height()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified"); throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified");
@ -1408,10 +1408,13 @@ static UniValue protx_list(const JSONRPCRequest& request, CDeterministicMNManage
protx_list_help(request); protx_list_help(request);
} }
LOCK(cs_main);
bool detailed = !request.params[1].isNull() ? ParseBoolV(request.params[1], "detailed") : false; bool detailed = !request.params[1].isNull() ? ParseBoolV(request.params[1], "detailed") : false;
#ifdef ENABLE_WALLET
LOCK2(wallet ? wallet->cs_wallet : cs_main, cs_main);
#else
LOCK(cs_main);
#endif
int height = !request.params[2].isNull() ? ParseInt32V(request.params[2], "height") : chainman.ActiveChain().Height(); int height = !request.params[2].isNull() ? ParseInt32V(request.params[2], "height") : chainman.ActiveChain().Height();
if (height < 1 || height > chainman.ActiveChain().Height()) { if (height < 1 || height > chainman.ActiveChain().Height()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified"); throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid height specified");