Merge pull request #4520

laanwj · laanwj · commit 77ed583f0f12 · 2014-07-14T08:50:29.000+02:00
39cc492 Fix Watchonly: cs_main lock not held (Cozz Lovan)
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1075,7 +1075,7 @@ int64_t CWallet::GetWatchOnlyBalance() const
 {
     int64_t nTotal = 0;
     {
-        LOCK(cs_wallet);
+        LOCK2(cs_main, cs_wallet);
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
@@ -1091,7 +1091,7 @@ int64_t CWallet::GetUnconfirmedWatchOnlyBalance() const
 {
     int64_t nTotal = 0;
     {
-        LOCK(cs_wallet);
+        LOCK2(cs_main, cs_wallet);
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;
@@ -1106,7 +1106,7 @@ int64_t CWallet::GetImmatureWatchOnlyBalance() const
 {
     int64_t nTotal = 0;
     {
-        LOCK(cs_wallet);
+        LOCK2(cs_main, cs_wallet);
         for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             const CWalletTx* pcoin = &(*it).second;

Original file line number	Diff line number	Diff line change
`@@ -1075,7 +1075,7 @@ int64_t CWallet::GetWatchOnlyBalance() const`
`1075`	`1075`	`{`
`1076`	`1076`	`int64_t nTotal = 0;`
`1077`	`1077`	`{`
`1078`		`- LOCK(cs_wallet);`
	`1078`	`+ LOCK2(cs_main, cs_wallet);`
`1079`	`1079`	`for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)`
`1080`	`1080`	`{`
`1081`	`1081`	`const CWalletTx* pcoin = &(*it).second;`
`@@ -1091,7 +1091,7 @@ int64_t CWallet::GetUnconfirmedWatchOnlyBalance() const`
`1091`	`1091`	`{`
`1092`	`1092`	`int64_t nTotal = 0;`
`1093`	`1093`	`{`
`1094`		`- LOCK(cs_wallet);`
	`1094`	`+ LOCK2(cs_main, cs_wallet);`
`1095`	`1095`	`for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)`
`1096`	`1096`	`{`
`1097`	`1097`	`const CWalletTx* pcoin = &(*it).second;`
`@@ -1106,7 +1106,7 @@ int64_t CWallet::GetImmatureWatchOnlyBalance() const`
`1106`	`1106`	`{`
`1107`	`1107`	`int64_t nTotal = 0;`
`1108`	`1108`	`{`
`1109`		`- LOCK(cs_wallet);`
	`1109`	`+ LOCK2(cs_main, cs_wallet);`
`1110`	`1110`	`for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)`
`1111`	`1111`	`{`
`1112`	`1112`	`const CWalletTx* pcoin = &(*it).second;`