zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4278 - LarryRuane:4223-fix-spentindex-test, r=daira 

insightexplorer: LOCK(cs_main) during rpcs

Closes #4223. Ensure lock cs_main is held during calls to GetSpentIndex().
This commit is contained in:
Homu 2019-12-28 14:43:08 +00:00
parent 5177d2e708 14ec1016b9
commit 1da79ed1c3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/blockchain.cpp
View File

@ -471,6 +471,8 @@ UniValue getblockdeltas(const UniValue& params, bool fHelp)
std::string strHash = params[0].get_str();
uint256 hash(uint256S(strHash));
LOCK(cs_main);
if (mapBlockIndex.count(hash) == 0)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");

7
src/rpc/misc.cpp
View File

@ -1099,8 +1099,11 @@ UniValue getspentinfo(const UniValue& params, bool fHelp)
CSpentIndexKey key(txid, outputIndex);
CSpentIndexValue value;
if (!GetSpentIndex(key, value)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to get spent info");
{
LOCK(cs_main);
if (!GetSpentIndex(key, value)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unable to get spent info");
}
}
UniValue obj(UniValue::VOBJ);
obj.push_back(Pair("txid", value.txid.GetHex()));