ContextualCheckBlockHeader should never have pindexPrev to NULL

NicolasDorier · NicolasDorier · commit cc44c8f143e9 · 2017-02-15T22:11:28.000+09:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2973,7 +2973,8 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
 
 bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)
 {
-    const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;
+    assert(pindexPrev != NULL);
+    const int nHeight = pindexPrev->nHeight + 1;
     // Check proof of work
     if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
         return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");

Original file line number	Diff line number	Diff line change
`@@ -2973,7 +2973,8 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc`
`2973`	`2973`
`2974`	`2974`	`bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime)`
`2975`	`2975`	`{`
`2976`		`- const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1;`
	`2976`	`+ assert(pindexPrev != NULL);`
	`2977`	`+ const int nHeight = pindexPrev->nHeight + 1;`
`2977`	`2978`	`// Check proof of work`
`2978`	`2979`	`if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))`
`2979`	`2980`	`return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work");`