Merge pull request #5154

laanwj · laanwj · commit 1ee685f984bd · 2014-11-24T15:29:52.000+01:00
730b1ed Check pindexBestForkBase for null (21E14)
diff --git a/src/main.cpp b/src/main.cpp
@@ -1228,13 +1228,13 @@ void CheckForkWarningConditions()
 
     if (pindexBestForkTip || (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.Tip()->nChainWork + (GetBlockProof(*chainActive.Tip()) * 6)))
     {
-        if (!fLargeWorkForkFound)
+        if (!fLargeWorkForkFound && pindexBestForkBase)
         {
             std::string warning = std::string("'Warning: Large-work fork detected, forking after block ") +
                 pindexBestForkBase->phashBlock->ToString() + std::string("'");
             CAlert::Notify(warning, true);
         }
-        if (pindexBestForkTip)
+        if (pindexBestForkTip && pindexBestForkBase)
         {
             LogPrintf("CheckForkWarningConditions: Warning: Large valid fork found\n  forking the chain at height %d (%s)\n  lasting to height %d (%s).\nChain state database corruption likely.\n",
                    pindexBestForkBase->nHeight, pindexBestForkBase->phashBlock->ToString(),

Original file line number	Diff line number	Diff line change
`@@ -1228,13 +1228,13 @@ void CheckForkWarningConditions()`
`1228`	`1228`
`1229`	`1229`	`if (pindexBestForkTip \|\| (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.Tip()->nChainWork + (GetBlockProof(chainActive.Tip()) 6)))`
`1230`	`1230`	`{`
`1231`		`- if (!fLargeWorkForkFound)`
	`1231`	`+ if (!fLargeWorkForkFound && pindexBestForkBase)`
`1232`	`1232`	`{`
`1233`	`1233`	`std::string warning = std::string("'Warning: Large-work fork detected, forking after block ") +`
`1234`	`1234`	`pindexBestForkBase->phashBlock->ToString() + std::string("'");`
`1235`	`1235`	`CAlert::Notify(warning, true);`
`1236`	`1236`	`}`
`1237`		`- if (pindexBestForkTip)`
	`1237`	`+ if (pindexBestForkTip && pindexBestForkBase)`
`1238`	`1238`	`{`
`1239`	`1239`	`LogPrintf("CheckForkWarningConditions: Warning: Large valid fork found\n forking the chain at height %d (%s)\n lasting to height %d (%s).\nChain state database corruption likely.\n",`
`1240`	`1240`	`pindexBestForkBase->nHeight, pindexBestForkBase->phashBlock->ToString(),`