aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-11-06 08:01:56 +0100
committerMarcoFalke <falke.marco@gmail.com>2020-11-06 08:02:00 +0100
commit65460c207c0b92122b8abf87495403d3a396da2b (patch)
treee298bdb3a0e999a4f748d391ccfaa16ed594a3fd
parentf5cdc290d5a41895d2bbaf474c3a951e5141b8a9 (diff)
parentfaf5fa74136b0117f02c5aa525bfff86654786ea (diff)
downloadbitcoin-65460c207c0b92122b8abf87495403d3a396da2b.tar.xz
Merge #20324: wallet: Set DatabaseStatus::SUCCESS in MakeSQLiteDatabase
faf5fa74136b0117f02c5aa525bfff86654786ea wallet: Set DatabaseStatus::SUCCESS in MakeSQLiteDatabase (MarcoFalke) Pull request description: This is a refactor to set the status to `SUCCESS` (like it is done in `MakeBerkeleyDatabase`, too). It also happens to fix a false positive valgrind warning (tested with bionic-gcc and focal-clang): ``` node1 stderr ==28149== Conditional jump or move depends on uninitialised value(s) ==28149== at 0x464471: LoadWallets(interfaces::Chain&) (load.cpp:105) ==28149== by 0x44BFBA: interfaces::(anonymous namespace)::WalletClientImpl::load() (wallet.cpp:510) ==28149== by 0x1640F9: AppInitMain(util::Ref const&, NodeContext&, interfaces::BlockAndHeaderTipInfo*) (init.cpp:1815) ==28149== by 0x144F3F: AppInit (bitcoind.cpp:142) ==28149== by 0x144F3F: main (bitcoind.cpp:172) ==28149== { <insert_a_suppression_name_here> Memcheck:Cond fun:_Z11LoadWalletsRN10interfaces5ChainE fun:_ZN10interfaces12_GLOBAL__N_116WalletClientImpl4loadEv fun:_Z11AppInitMainRKN4util3RefER11NodeContextPN10interfaces21BlockAndHeaderTipInfoE fun:AppInit fun:main } TEST | STATUS | DURATION wallet_hd.py --descriptors | ✖ Failed | 69 s ``` ACKs for top commit: achow101: ACK faf5fa74136b0117f02c5aa525bfff86654786ea Tree-SHA512: e8cbac195d05518467f89725d413bdf226d74671eba1c1eb80b3a61d65724af75a1fe93bcb5c608eaa0d54eddce992738bd923e7d83e493f54c3f4c67b66408c
-rw-r--r--src/wallet/sqlite.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
index 3d21529fbb..d83332c194 100644
--- a/src/wallet/sqlite.cpp
+++ b/src/wallet/sqlite.cpp
@@ -581,6 +581,7 @@ std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const D
status = DatabaseStatus::FAILED_VERIFY;
return nullptr;
}
+ status = DatabaseStatus::SUCCESS;
return db;
} catch (const std::runtime_error& e) {
status = DatabaseStatus::FAILED_LOAD;