From aaf8d157082ec0aec03c734ab3368fa8e2c4556c Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 15 Dec 2013 13:37:10 +0100
Subject: qt: Add missing LOCKs for locked coin functions

These don't aquire the wallet lock internally, so the caller has to do
it.
---
 src/qt/walletmodel.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/qt/walletmodel.cpp')

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index f08342b83..78bc17062 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -531,20 +531,24 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
 
 bool WalletModel::isLockedCoin(uint256 hash, unsigned int n) const
 {
+    LOCK(wallet->cs_wallet);
     return wallet->IsLockedCoin(hash, n);
 }
 
 void WalletModel::lockCoin(COutPoint& output)
 {
+    LOCK(wallet->cs_wallet);
     wallet->LockCoin(output);
 }
 
 void WalletModel::unlockCoin(COutPoint& output)
 {
+    LOCK(wallet->cs_wallet);
     wallet->UnlockCoin(output);
 }
 
 void WalletModel::listLockedCoins(std::vector<COutPoint>& vOutpts)
 {
+    LOCK(wallet->cs_wallet);
     wallet->ListLockedCoins(vOutpts);
 }
-- 
cgit v1.2.3


From d31ad26550403d9ed8d5aedd0f65d610b55d9497 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 6 Jan 2014 12:58:06 +0100
Subject: qt: Add missing lock in WalletModel::listCoins

Another problem detected by cs_wallet lock detection (#3401).
---
 src/qt/walletmodel.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/qt/walletmodel.cpp')

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 78bc17062..6f3e3b0aa 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -502,6 +502,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
     std::vector<COutput> vCoins;
     wallet->AvailableCoins(vCoins);
 
+    LOCK(wallet->cs_wallet); // ListLockedCoins, mapWallet
     std::vector<COutPoint> vLockedCoins;
     wallet->ListLockedCoins(vLockedCoins);
 
-- 
cgit v1.2.3