kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-02-11 14:44:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix locking in GetTransaction.

Browse Source 
GetTransaction needs to lock cs_main until ReadBlockFromDisk completes, the data inside CBlockIndex's can change since pruning.  This lock was held by all calls to GetTransaction except rest_tx.
This commit is contained in:
Alex Morcos 2015-09-17 17:43:34 -04:00
parent 83f0e22497
commit 131c23d027
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@ -954,14 +954,13 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow) bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow)
{ {
CBlockIndex *pindexSlow = NULL; CBlockIndex *pindexSlow = NULL;
{
LOCK(cs_main); LOCK(cs_main);
{
if (mempool.lookup(hash, txOut)) if (mempool.lookup(hash, txOut))
{ {
return true; return true;
} }
}
if (fTxIndex) { if (fTxIndex) {
CDiskTxPos postx; CDiskTxPos postx;
@ -995,7 +994,6 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock
if (nHeight > 0) if (nHeight > 0)
pindexSlow = chainActive[nHeight]; pindexSlow = chainActive[nHeight];
} }
}
if (pindexSlow) { if (pindexSlow) {
CBlock block; CBlock block;