fix possible shutdown assertion with -reindex-shutdown

theuni · theuni · commit ceaefdd5f362 · 2018-02-13T00:38:25.000-05:00
Credit @eklitzke for reproducing.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2087,7 +2087,7 @@ bool static FlushStateToDisk(const CChainParams& chainparams, CValidationState &
             nLastWrite = nNow;
         }
         // Flush best chain related state. This can only be done if the blocks / block index write was also done.
-        if (fDoFullFlush) {
+        if (fDoFullFlush && !pcoinsTip->GetBestBlock().IsNull()) {
             // Typical Coin structures on disk are around 48 bytes in size.
             // Pushing a new one to the database can cause it to be written
             // twice (once in the log, and once in the tables). This is already

Original file line number	Diff line number	Diff line change
`@@ -2087,7 +2087,7 @@ bool static FlushStateToDisk(const CChainParams& chainparams, CValidationState &`
`2087`	`2087`	`nLastWrite = nNow;`
`2088`	`2088`	`}`
`2089`	`2089`	`// Flush best chain related state. This can only be done if the blocks / block index write was also done.`
`2090`		`- if (fDoFullFlush) {`
	`2090`	`+ if (fDoFullFlush && !pcoinsTip->GetBestBlock().IsNull()) {`
`2091`	`2091`	`// Typical Coin structures on disk are around 48 bytes in size.`
`2092`	`2092`	`// Pushing a new one to the database can cause it to be written`
`2093`	`2093`	`// twice (once in the log, and once in the tables). This is already`