Fix fast-shutdown crash if genesis block was not loaded

TheBlueMatt · furszy · commit c2ae5ffc6d9c · 2021-04-08T17:47:57.000-03:00
If the ShutdownRequested() check at the top of ActivateBestChain() returns false during initial genesis block load we will fail an assertion in UTXO DB flush as the best block hash IsNull(). To work around this, we move the check until after one round of ActivateBestChainStep(), ensuring the genesis block gets connected. Github-Pull: #2290 Rebased-From: 8640be1
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2276,6 +2276,12 @@ bool ActivateBestChain(CValidationState& state, std::shared_ptr<const CBlock> pb
         }
         // When we reach this point, we switched to a new tip (stored in pindexNewTip).
 
+        // We check shutdown only after giving ActivateBestChainStep a chance to run once so that we
+        // never shutdown before connecting the genesis block during LoadChainTip(). Previously this
+        // caused an assert() failure during shutdown in such cases as the UTXO DB flushing checks
+        // that the best block hash is non-null.
+        if (ShutdownRequested())
+            break;
     } while (pindexMostWork != chainActive.Tip());
 
     CheckBlockIndex();
