pow: GetNextWorkRequired never called with NULL pindexLast

dcousens · NicolasDorier · commit 972714c95687 · 2017-02-15T22:11:29.000+09:00
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -12,12 +12,9 @@
 
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
+    assert(pindexLast != NULL);
     unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
 
-    // Genesis block
-    if (pindexLast == NULL)
-        return nProofOfWorkLimit;
-
     // Only change once per difficulty adjustment interval
     if ((pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval() != 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,9 @@`
`12`	`12`
`13`	`13`	`unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)`
`14`	`14`	`{`
	`15`	`+ assert(pindexLast != NULL);`
`15`	`16`	`unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();`
`16`	`17`
`17`		`- // Genesis block`
`18`		`- if (pindexLast == NULL)`
`19`		`- return nProofOfWorkLimit;`
`20`		`-`
`21`	`18`	`// Only change once per difficulty adjustment interval`
`22`	`19`	`if ((pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval() != 0)`
`23`	`20`	`{`