aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-05-01 14:59:55 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2017-05-01 15:01:32 -0700
commitc45da32047cac54afc99cf9b8a539389c577ded1 (patch)
tree7d2cac2616505840d0d7735681f215e442cec6ea
parentab1f1d32469180b3d011e9625d67c86a22b55903 (diff)
parent70d39454ee4d8fa69110476f0aa7081972559b3a (diff)
downloadbitcoin-c45da32047cac54afc99cf9b8a539389c577ded1.tar.xz
Merge #10305: Fix potential NPD introduced in b297426c
70d3945 Fix potential NPD introduced in b297426c (Matt Corallo) Tree-SHA512: 920d03d2081ba2f3447cfa655dcbc3e17858454dab051436f717ada977d4f4bfe999c303018bc8aa33f30e37a97c63d70ba08632f5e7b7a8aa555615dde2191a
-rw-r--r--src/validation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index 8613241d68..1030fe1b17 100644
--- 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;
}