Permalink
Browse files

Merge pull request #6377

c433828 Handle no chain tip available in InvalidChainFound() (Ross Nicoll)
  • Loading branch information...
laanwj committed Aug 7, 2015
2 parents 41d650f + c433828 commit e545371b77d419b3bf4dd194b3f3c107d9bce6d1
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/main.cpp
View
@@ -1228,9 +1228,11 @@ void static InvalidChainFound(CBlockIndex* pindexNew)
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
log(pindexNew->nChainWork.getdouble())/log(2.0), DateTimeStrFormat("%Y-%m-%d %H:%M:%S",
pindexNew->GetBlockTime()));
+ CBlockIndex *tip = chainActive.Tip();
+ assert (tip);
LogPrintf("%s: current best=%s height=%d log2_work=%.8g date=%s\n", __func__,
- chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0),
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()));
+ tip->GetBlockHash().ToString(), chainActive.Height(), log(tip->nChainWork.getdouble())/log(2.0),
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S", tip->GetBlockTime()));
CheckForkWarningConditions();
}

0 comments on commit e545371

Please sign in to comment.