From 742a4659f4624efedb3bf6c288db77b4abd66baa Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Sat, 1 Feb 2020 14:21:33 +0000
Subject: AddressBook: thread-safety, fix use-after-free

---
 src/libwalletqt/AddressBook.cpp | 61 +++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 17 deletions(-)

(limited to 'src/libwalletqt/AddressBook.cpp')

diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp
index 4e34e135..d51fecc0 100644
--- a/src/libwalletqt/AddressBook.cpp
+++ b/src/libwalletqt/AddressBook.cpp
@@ -46,58 +46,85 @@ int AddressBook::errorCode() const
     return m_addressBookImpl->errorCode();
 }
 
-QList<Monero::AddressBookRow*> AddressBook::getAll(bool update) const
+void AddressBook::getAll()
 {
     qDebug(__FUNCTION__);
 
     emit refreshStarted();
 
-    if(update)
-        m_rows.clear();
+    {
+        QWriteLocker locker(&m_lock);
 
-    if (m_rows.empty()){
+        m_rows.clear();
         for (auto &abr: m_addressBookImpl->getAll()) {
             m_rows.append(abr);
         }
     }
 
     emit refreshFinished();
-    return m_rows;
-
 }
 
-Monero::AddressBookRow * AddressBook::getRow(int index) const
+bool AddressBook::getRow(int index, std::function<void (Monero::AddressBookRow &)> callback) const
 {
-    return m_rows.at(index);
+    QReadLocker locker(&m_lock);
+
+    if (index < 0 || index >= m_rows.size())
+    {
+        return false;
+    }
+
+    callback(*m_rows.value(index));
+    return true;
 }
 
-bool AddressBook::addRow(const QString &address, const QString &payment_id, const QString &description) const
+bool AddressBook::addRow(const QString &address, const QString &payment_id, const QString &description)
 {
     //  virtual bool addRow(const std::string &dst_addr , const std::string &payment_id, const std::string &description) = 0;
-    bool r = m_addressBookImpl->addRow(address.toStdString(), payment_id.toStdString(), description.toStdString());
+    bool result;
+
+    {
+        QWriteLocker locker(&m_lock);
+
+        result = m_addressBookImpl->addRow(address.toStdString(), payment_id.toStdString(), description.toStdString());
+    }
 
-    if(r)
-        getAll(true);
+    if (result)
+    {
+        getAll();
+    }
 
-    return r;
+    return result;
 }
 
-bool AddressBook::deleteRow(int rowId) const
+bool AddressBook::deleteRow(int rowId)
 {
-    bool r = m_addressBookImpl->deleteRow(rowId);
+    bool result;
+
+    {
+        QWriteLocker locker(&m_lock);
+
+        result = m_addressBookImpl->deleteRow(rowId);
+    }
 
     // Fetch new data from wallet2.
-    getAll(true);
+    if (result)
+    {
+        getAll();
+    }
 
-    return r;
+    return result;
 }
 
 quint64 AddressBook::count() const
 {
+    QReadLocker locker(&m_lock);
+
     return m_rows.size();
 }
 
 int AddressBook::lookupPaymentID(const QString &payment_id) const
 {
+    QReadLocker locker(&m_lock);
+
     return m_addressBookImpl->lookupPaymentID(payment_id.toStdString());
 }
-- 
cgit v1.2.3