Move recentRejects initialization to top of InitBlockIndex

laanwj · laanwj · commit a8d0407c4fcf · 2015-07-31T17:58:12.000+02: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
@@ -3311,6 +3311,10 @@ bool LoadBlockIndex()
 bool InitBlockIndex() {
     const CChainParams& chainparams = Params();
     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;
@@ -3344,9 +3348,6 @@ bool InitBlockIndex() {
         }
     }
 
-    // Initialize global variables that cannot be constructed at startup.
-    recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
-
     return true;
 }
 
@@ -3716,6 +3717,7 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
     {
     case MSG_TX:
         {
+            assert(recentRejects);
             if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip)
             {
                 // If the chain tip has changed previously rejected transactions
@@ -4329,6 +4331,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                         // Probably non-standard or insufficient fee/priority
                         LogPrint("mempool", "   removed orphan tx %s\n", orphanHash.ToString());
                         vEraseQueue.push_back(orphanHash);
+                        assert(recentRejects);
                         recentRejects->insert(orphanHash);
                     }
                     mempool.check(pcoinsTip);
@@ -4352,6 +4355,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             // 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
`@@ -3311,6 +3311,10 @@ bool LoadBlockIndex()`
`3311`	`3311`	`bool InitBlockIndex() {`
`3312`	`3312`	`const CChainParams& chainparams = Params();`
`3313`	`3313`	`LOCK(cs_main);`
	`3314`	`+`
	`3315`	`+ // Initialize global variables that cannot be constructed at startup.`
	`3316`	`+ recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));`
	`3317`	`+`
`3314`	`3318`	`// Check whether we're already initialized`
`3315`	`3319`	`if (chainActive.Genesis() != NULL)`
`3316`	`3320`	`return true;`
`@@ -3344,9 +3348,6 @@ bool InitBlockIndex() {`
`3344`	`3348`	`}`
`3345`	`3349`	`}`
`3346`	`3350`
`3347`		`- // Initialize global variables that cannot be constructed at startup.`
`3348`		`- recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));`
`3349`		`-`
`3350`	`3351`	`return true;`
`3351`	`3352`	`}`
`3352`	`3353`
`@@ -3716,6 +3717,7 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`3716`	`3717`	`{`
`3717`	`3718`	`case MSG_TX:`
`3718`	`3719`	`{`
	`3720`	`+ assert(recentRejects);`
`3719`	`3721`	`if (chainActive.Tip()->GetBlockHash() != hashRecentRejectsChainTip)`
`3720`	`3722`	`{`
`3721`	`3723`	`// If the chain tip has changed previously rejected transactions`
`@@ -4329,6 +4331,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`4329`	`4331`	`// Probably non-standard or insufficient fee/priority`
`4330`	`4332`	`LogPrint("mempool", " removed orphan tx %s\n", orphanHash.ToString());`
`4331`	`4333`	`vEraseQueue.push_back(orphanHash);`
	`4334`	`+ assert(recentRejects);`
`4332`	`4335`	`recentRejects->insert(orphanHash);`
`4333`	`4336`	`}`
`4334`	`4337`	`mempool.check(pcoinsTip);`
`@@ -4352,6 +4355,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`4352`	`4355`	`// already in the mempool; if the tx isn't in the mempool that`
`4353`	`4356`	`// means it was rejected and we shouldn't ask for it again.`
`4354`	`4357`	`if (!mempool.exists(tx.GetHash())) {`
	`4358`	`+ assert(recentRejects);`
`4355`	`4359`	`recentRejects->insert(tx.GetHash());`
`4356`	`4360`	`}`
`4357`	`4361`	`if (pfrom->fWhitelisted) {`