Move recentRejects initialization to top of InitBlockIndex

laanwj · Fuzzbawls · commit 93e8c4679f4b · 2020-06-22T17:38:08.000-07:00
This avoids that premature return in the condition that a new chain is initialized
results in NULL pointer errors due to recentReject not being constructed.

Also add assertions where it is used.
diff --git a/src/main.cpp b/src/main.cpp
@@ -4710,6 +4710,10 @@ bool LoadBlockIndex(std::string& strError)
 bool InitBlockIndex()
 {
     LOCK(cs_main);
+
+    // Initialize global variables that cannot be constructed at startup.
+    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
+
     // Check whether we're already initialized
     if (chainActive.Genesis() != NULL)
         return true;
@@ -4741,9 +4745,6 @@ bool InitBlockIndex()
         }
     }
 
-    // Initialize global variables that cannot be constructed at startup.
-    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
-
     return true;
 }
 
@@ -5033,6 +5034,7 @@ bool static AlreadyHave(const CInv& inv)
 {
     switch (inv.type) {
     case MSG_TX: {
+        assert(recentRejects);
         if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip) {
             // If the chain tip has changed previously rejected transactions
             // might be now valid, e.g. due to a nLockTime'd tx becoming valid,
@@ -5773,6 +5775,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
                         // Probably non-standard or insufficient fee/priority
                         LogPrint(BCLog::MEMPOOL, "   removed orphan tx %s\n", orphanHash.ToString());
                         vEraseQueue.push_back(orphanHash);
+                        assert(recentRejects);
                         recentRejects->insert(orphanHash);
                     }
                     mempool.check(pcoinsTip);
@@ -5802,6 +5805,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             // already in the mempool; if the tx isn't in the mempool that
             // means it was rejected and we shouldn't ask for it again.
             if (!mempool.exists(tx.GetHash())) {
+                assert(recentRejects);
                 recentRejects->insert(tx.GetHash());
             }
             if (pfrom->fWhitelisted) {

Original file line number	Diff line number	Diff line change
`@@ -4710,6 +4710,10 @@ bool LoadBlockIndex(std::string& strError)`
`4710`	`4710`	`bool InitBlockIndex()`
`4711`	`4711`	`{`
`4712`	`4712`	`LOCK(cs_main);`
	`4713`	`+`
	`4714`	`+ // Initialize global variables that cannot be constructed at startup.`
	`4715`	`+ recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));`
	`4716`	`+`
`4713`	`4717`	`// Check whether we're already initialized`
`4714`	`4718`	`if (chainActive.Genesis() != NULL)`
`4715`	`4719`	`return true;`
`@@ -4741,9 +4745,6 @@ bool InitBlockIndex()`
`4741`	`4745`	`}`
`4742`	`4746`	`}`
`4743`	`4747`
`4744`		`- // Initialize global variables that cannot be constructed at startup.`
`4745`		`- recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));`
`4746`		`-`
`4747`	`4748`	`return true;`
`4748`	`4749`	`}`
`4749`	`4750`
`@@ -5033,6 +5034,7 @@ bool static AlreadyHave(const CInv& inv)`
`5033`	`5034`	`{`
`5034`	`5035`	`switch (inv.type) {`
`5035`	`5036`	`case MSG_TX: {`
	`5037`	`+ assert(recentRejects);`
`5036`	`5038`	`if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip) {`
`5037`	`5039`	`// If the chain tip has changed previously rejected transactions`
`5038`	`5040`	`// might be now valid, e.g. due to a nLockTime'd tx becoming valid,`
`@@ -5773,6 +5775,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR`
`5773`	`5775`	`// Probably non-standard or insufficient fee/priority`
`5774`	`5776`	`LogPrint(BCLog::MEMPOOL, " removed orphan tx %s\n", orphanHash.ToString());`
`5775`	`5777`	`vEraseQueue.push_back(orphanHash);`
	`5778`	`+ assert(recentRejects);`
`5776`	`5779`	`recentRejects->insert(orphanHash);`
`5777`	`5780`	`}`
`5778`	`5781`	`mempool.check(pcoinsTip);`
`@@ -5802,6 +5805,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR`
`5802`	`5805`	`// already in the mempool; if the tx isn't in the mempool that`
`5803`	`5806`	`// means it was rejected and we shouldn't ask for it again.`
`5804`	`5807`	`if (!mempool.exists(tx.GetHash())) {`
	`5808`	`+ assert(recentRejects);`
`5805`	`5809`	`recentRejects->insert(tx.GetHash());`
`5806`	`5810`	`}`
`5807`	`5811`	`if (pfrom->fWhitelisted) {`