aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoão Barbosa <joao.paulo.barbosa@gmail.com>2017-07-13 23:25:56 +0100
committerJoão Barbosa <joao.paulo.barbosa@gmail.com>2017-07-13 23:25:56 +0100
commit4652791141f0a8a977b324147ccf1a2360b69ca4 (patch)
tree8c37c93c53baf1f7fa942028302d4d539c96739d
parent7666250ffb4e8fc5c98556e2c8e121c72d6fe54c (diff)
downloadbitcoin-4652791141f0a8a977b324147ccf1a2360b69ca4.tar.xz
Fix uninitialized atomic variables
-rw-r--r--src/netbase.cpp2
-rw-r--r--src/wallet/db.h4
-rw-r--r--src/wallet/walletdb.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp
index a23f92e1ed..3fb1c18f03 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -563,7 +563,7 @@ static bool ConnectThroughProxy(const proxyType &proxy, const std::string& strDe
// do socks negotiation
if (proxy.randomize_credentials) {
ProxyCredentials random_auth;
- static std::atomic_int counter;
+ static std::atomic_int counter(0);
random_auth.username = random_auth.password = strprintf("%i", counter++);
if (!Socks5(strDest, (unsigned short)port, &random_auth, hSocket))
return false;
diff --git a/src/wallet/db.h b/src/wallet/db.h
index 7cccc65660..4f3ad0c42d 100644
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@@ -95,13 +95,13 @@ class CWalletDBWrapper
friend class CDB;
public:
/** Create dummy DB handle */
- CWalletDBWrapper() : nLastSeen(0), nLastFlushed(0), nLastWalletUpdate(0), env(nullptr)
+ CWalletDBWrapper() : nUpdateCounter(0), nLastSeen(0), nLastFlushed(0), nLastWalletUpdate(0), env(nullptr)
{
}
/** Create DB handle to real database */
CWalletDBWrapper(CDBEnv *env_in, const std::string &strFile_in) :
- nLastSeen(0), nLastFlushed(0), nLastWalletUpdate(0), env(env_in), strFile(strFile_in)
+ nUpdateCounter(0), nLastSeen(0), nLastFlushed(0), nLastWalletUpdate(0), env(env_in), strFile(strFile_in)
{
}
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index deb09a4771..2a33dca240 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -747,7 +747,7 @@ DBErrors CWalletDB::ZapWalletTx(std::vector<CWalletTx>& vWtx)
void MaybeCompactWalletDB()
{
- static std::atomic<bool> fOneThread;
+ static std::atomic<bool> fOneThread(false);
if (fOneThread.exchange(true)) {
return;
}