Merge #12349: shutdown: fix crash on shutdown with reindex-chainstate

laanwj · laanwj · commit 5eff1c748d56 · 2018-02-15T22:21:57.000+01:00
ceaefdd fix possible shutdown assertion with -reindex-shutdown (Cory Fields) Pull request description: Fixes the assertion error reported here: bitcoin/bitcoin#12349 (comment) Tree-SHA512: db8e2a275f92a99df7f17852d00eba6df996e412aa3ed3853a9ea0a8cb9800760677532efd52f92abbf2cdcc4210957a87a5f919ac998d46c205365a7a7dffca
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`