diff options
| author | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-01-11 23:40:43 +0000 |
|---|---|---|
| committer | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-03-06 19:21:15 +0000 |
| commit | f814a3e8fa0d99c3d95ae7866c707617a1dd3d4e (patch) | |
| tree | 067dcb86e75103e4ef6ced38fbf78d379ab145e4 /src | |
| parent | c651df8b32d82695b497c969bfc9f2b1374081a8 (diff) | |
| download | bitcoin-f814a3e8fa0d99c3d95ae7866c707617a1dd3d4e.tar.xz | |
Fix cs_main lock in LoadExternalBlockFile
When accessing mapBlockIndex cs_main must be held.
Diffstat (limited to 'src')
| -rw-r--r-- | src/validation.cpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 18412d9e94..5ccbb49ac3 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4252,26 +4252,28 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB blkdat >> block; nRewind = blkdat.GetPos(); - // detect out of order blocks, and store them for later uint256 hash = block.GetHash(); - if (hash != chainparams.GetConsensus().hashGenesisBlock && mapBlockIndex.find(block.hashPrevBlock) == mapBlockIndex.end()) { - LogPrint(BCLog::REINDEX, "%s: Out of order block %s, parent %s not known\n", __func__, hash.ToString(), - block.hashPrevBlock.ToString()); - if (dbp) - mapBlocksUnknownParent.insert(std::make_pair(block.hashPrevBlock, *dbp)); - continue; - } - - // process in case the block isn't known yet - if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) { + { LOCK(cs_main); - CValidationState state; - if (g_chainstate.AcceptBlock(pblock, state, chainparams, nullptr, true, dbp, nullptr)) - nLoaded++; - if (state.IsError()) - break; - } else if (hash != chainparams.GetConsensus().hashGenesisBlock && mapBlockIndex[hash]->nHeight % 1000 == 0) { - LogPrint(BCLog::REINDEX, "Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight); + // detect out of order blocks, and store them for later + if (hash != chainparams.GetConsensus().hashGenesisBlock && mapBlockIndex.find(block.hashPrevBlock) == mapBlockIndex.end()) { + LogPrint(BCLog::REINDEX, "%s: Out of order block %s, parent %s not known\n", __func__, hash.ToString(), + block.hashPrevBlock.ToString()); + if (dbp) + mapBlocksUnknownParent.insert(std::make_pair(block.hashPrevBlock, *dbp)); + continue; + } + + // process in case the block isn't known yet + if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) { + CValidationState state; + if (g_chainstate.AcceptBlock(pblock, state, chainparams, nullptr, true, dbp, nullptr)) + nLoaded++; + if (state.IsError()) + break; + } else if (hash != chainparams.GetConsensus().hashGenesisBlock && mapBlockIndex[hash]->nHeight % 1000 == 0) { + LogPrint(BCLog::REINDEX, "Block Import: already had block %s at height %d\n", hash.ToString(), mapBlockIndex[hash]->nHeight); + } } // Activate the genesis block so normal node progress can continue |