Merge #13199: Bugfix: ensure consistency of m_failed_blocks after reconsiderblock

sipa · sipa · commit 418ae49ee1ea · 2018-05-12T11:32:09.000-07:00
11fa6bb Bugfix: ensure consistency of m_failed_blocks after reconsiderblock (Suhas Daftuar) Pull request description: This was introduced in 015a525 and could cause a node to crash (due to assertion failure) when using the `reconsiderblock` rpc. Tree-SHA512: 820dcd761bf983e36f5d0f16777ed75c833daaf62a6b3a4dbd17f6caaf9287223e3a202d06540ac62f8ba72926b73b0873bb76c6273ddcb19d9408f4c1cd325e
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2841,6 +2841,7 @@ bool CChainState::ResetBlockFailureFlags(CBlockIndex *pindex) {
         if (pindex->nStatus & BLOCK_FAILED_MASK) {
             pindex->nStatus &= ~BLOCK_FAILED_MASK;
             setDirtyBlockIndex.insert(pindex);
+            m_failed_blocks.erase(pindex);
         }
         pindex = pindex->pprev;
     }

Original file line number	Diff line number	Diff line change
`@@ -2841,6 +2841,7 @@ bool CChainState::ResetBlockFailureFlags(CBlockIndex *pindex) {`
`2841`	`2841`	`if (pindex->nStatus & BLOCK_FAILED_MASK) {`
`2842`	`2842`	`pindex->nStatus &= ~BLOCK_FAILED_MASK;`
`2843`	`2843`	`setDirtyBlockIndex.insert(pindex);`
	`2844`	`+ m_failed_blocks.erase(pindex);`
`2844`	`2845`	`}`
`2845`	`2846`	`pindex = pindex->pprev;`
`2846`	`2847`	`}`