Merge #10819: Fix uninitialized atomic variables

4652791 Fix uninitialized atomic variables (João Barbosa) Tree-SHA512: 5dd8924bc8743a094abdbc2464b835a0e7fd4948c102ea7c2251c6330bea5615c4459ba322a656fd6ac5f8d695b69d3709d225ddccef226cf8afc7de5e3d3019
bitcoin · b7d6623c76e1468f2a93db5a3120580e2784d74a · sipa committed Jul 14, 2017

This commit was signed with a verified signature.

sipa Pieter Wuille

GPG key ID: A636E97631F767E0 Learn about signing commits · Jul 14, 2017 · b7d6623
2 parents 66270a4 + 4652791
commit b7d6623c76e1468f2a93db5a3120580e2784d74a
Unified Split

Showing with 4 additions and 4 deletions.

+1 −1 src/netbase.cpp

+2 −2 src/wallet/db.h

+1 −1 src/wallet/walletdb.cpp
diff --git 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
@@ -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
@@ -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;
     }