maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bugfix: break ActivateBestChain() differently on shutdown

Browse source 
Moves the break in ActivateBestChain() when a node is being shut
down from the beginning of the loop block to the end, allowing
pindexNewTip to be populated with chainActive.Tip() rather than
its initial NULL value. Solves issues when shutting down nodes
while inside the ActivateBestChain loop.
This commit is contained in:
Patrick Lodder 2021-08-04 00:07:58 +02:00
parent 290faedcc3
commit 0c3d683be4
No known key found for this signature in database
GPG key ID: 2D3A345B98D0DC1F
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/validation.cpp
View file

@ -2504,9 +2504,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
CBlockIndex *pindexMostWork = NULL;
CBlockIndex *pindexNewTip = NULL;
do {
boost::this_thread::interruption_point();
if (ShutdownRequested())
break;
const CBlockIndex *pindexFork;
ConnectTrace connectTrace;
@ -2566,6 +2563,15 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
if (pindexFork != pindexNewTip) {
uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);
}
// Perform the shutdown detection to the end of the loop to prevent
// pindexNewTip being nil
boost::this_thread::interruption_point();
if (ShutdownRequested()) {
LogPrintf("ActivateBestChain: shutdown requested, breaking loop\n");
break;
}
} while (pindexNewTip != pindexMostWork);
CheckBlockIndex(chainparams.GetConsensus(pindexNewTip->nHeight));