[Refactoring][BUG] Unchecked LoadGenesisBlock return value

furszy · Mar 2, 2021 · 4749d52 · 4749d52
1 parent 43cc880
commit 4749d52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -690,7 +690,9 @@ void ThreadImport(const std::vector<fs::path>& vImportFiles)
         fReindex = false;
         LogPrintf("Reindexing finished\n");
         // To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):
-        LoadGenesisBlock();
+        if (!LoadGenesisBlock()) {
+            throw std::runtime_error("Error initializing block database");
+        }
     }
 
     // hardcoded $DATADIR/bootstrap.dat

diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -72,7 +72,9 @@ TestingSetup::TestingSetup()
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
-        LoadGenesisBlock();
+        if (!LoadGenesisBlock()) {
+            throw std::runtime_error("Error initializing block database");
+        }
         {
             CValidationState state;
             bool ok = ActivateBestChain(state);