Merge #10305: Fix potential NPD introduced in b297426

sipa · sipa · commit c45da32047ca · 2017-05-01T15:01:32.000-07:00
70d3945 Fix potential NPD introduced in b297426 (Matt Corallo) Tree-SHA512: 920d03d2081ba2f3447cfa655dcbc3e17858454dab051436f717ada977d4f4bfe999c303018bc8aa33f30e37a97c63d70ba08632f5e7b7a8aa555615dde2191a
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`	`}`