zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NPE defense in metrics screen

This commit is contained in:
Eirik Ogilvie-Wigley 2019-08-06 09:45:17 -06:00
parent 2f00729061
commit cdb6757095
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/metrics.cpp
View File

@ -120,7 +120,7 @@ int EstimateNetHeight(const Consensus::Params& params, int currentHeadersHeight,
int blossomActivationHeight = params.vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
if (currentHeadersHeight >= blossomActivationHeight || estimatedHeight <= blossomActivationHeight) {
return estimatedHeight;
return ((estimatedHeight + 5) / 10) * 10;
}
int numPreBlossomBlocks = blossomActivationHeight - currentHeadersHeight;
@ -206,9 +206,9 @@ int printStats(bool mining)
int64_t netsolps;
{
LOCK2(cs_main, cs_vNodes);
height = chainActive.Tip()->nHeight;
currentHeadersHeight = pindexBestHeader->nHeight;
currentHeadersTime = pindexBestHeader->nTime;
height = chainActive.Height();
currentHeadersHeight = pindexBestHeader ? pindexBestHeader->nHeight: -1;
currentHeadersTime = pindexBestHeader ? pindexBestHeader->nTime : 0;
connections = vNodes.size();
netsolps = GetNetworkHashPS(120, -1);
}