From 03f75c42e12a272057adccb6f0077e71f971eeef Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 6 Oct 2020 16:13:50 -0400 Subject: [PATCH] validation: Use existing chain member in CChainState::LoadGenesisBlock --- src/validation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/validation.cpp b/src/validation.cpp index b40e1f53b93..e1cd97a38ef 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4629,9 +4629,10 @@ bool CChainState::LoadGenesisBlock(const CChainParams& chainparams) if (m_blockman.m_block_index.count(chainparams.GenesisBlock().GetHash())) return true; + assert(std::addressof(::ChainActive()) == std::addressof(m_chain)); try { const CBlock& block = chainparams.GenesisBlock(); - FlatFilePos blockPos = SaveBlockToDisk(block, 0, ::ChainActive(), chainparams, nullptr); + FlatFilePos blockPos = SaveBlockToDisk(block, 0, m_chain, chainparams, nullptr); if (blockPos.IsNull()) return error("%s: writing genesis block to disk failed", __func__); CBlockIndex *pindex = m_blockman.AddToBlockIndex(block);