Fix potential NPD introduced in b297426

TheBlueMatt · TheBlueMatt · commit 70d39454ee4d · 2017-05-01T11:51:06.000-04:00
See bitcoin/bitcoin#10290 (comment) for more info.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2538,7 +2538,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
     }
 
     int nStopAtHeight = GetArg("-stopatheight", DEFAULT_STOPATHEIGHT);
-    if (nStopAtHeight && pindexNewTip->nHeight >= nStopAtHeight) StartShutdown();
+    if (nStopAtHeight && pindexNewTip && pindexNewTip->nHeight >= nStopAtHeight) StartShutdown();
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -2538,7 +2538,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,`
`2538`	`2538`	`}`
`2539`	`2539`
`2540`	`2540`	`int nStopAtHeight = GetArg("-stopatheight", DEFAULT_STOPATHEIGHT);`
`2541`		`- if (nStopAtHeight && pindexNewTip->nHeight >= nStopAtHeight) StartShutdown();`
	`2541`	`+ if (nStopAtHeight && pindexNewTip && pindexNewTip->nHeight >= nStopAtHeight) StartShutdown();`
`2542`	`2542`
`2543`	`2543`	`return true;`
`2544`	`2544`	`}`