Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-08 09:47:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2627

Browse Source 
8c51172 Subaddress: fix use-after-free on accessing stale Wallet API data (xiphon)
This commit is contained in:
luigi1111
2019-12-19 19:46:45 -05:00
parent b963028f10 8c511722e0
commit f2424ddeaa
3 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libwalletqt/Subaddress.cpp
View File

@@ -36,49 +36,58 @@ Subaddress::Subaddress(Monero::Subaddress *subaddressImpl, QObject *parent)
getAll();
}
QList<Monero::SubaddressRow*> Subaddress::getAll(bool update) const
void Subaddress::getAll() const
{
qDebug(__FUNCTION__);
emit refreshStarted();
if(update)
m_rows.clear();
{
QWriteLocker locker(&m_lock);
if (m_rows.empty()){
m_rows.clear();
for (auto &row: m_subaddressImpl->getAll()) {
m_rows.append(row);
}
}
emit refreshFinished();
return m_rows;
}
Monero::SubaddressRow * Subaddress::getRow(int index) const
bool Subaddress::getRow(int index, std::function<void (Monero::SubaddressRow &row)> 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;
}
void Subaddress::addRow(quint32 accountIndex, const QString &label) const
{
m_subaddressImpl->addRow(accountIndex, label.toStdString());
getAll(true);
getAll();
}
void Subaddress::setLabel(quint32 accountIndex, quint32 addressIndex, const QString &label) const
{
m_subaddressImpl->setLabel(accountIndex, addressIndex, label.toStdString());
getAll(true);
getAll();
}
void Subaddress::refresh(quint32 accountIndex) const
{
m_subaddressImpl->refresh(accountIndex);
getAll(true);
getAll();
}
quint64 Subaddress::count() const
{
QReadLocker locker(&m_lock);
return m_rows.size();
}

6
src/libwalletqt/Subaddress.h
View File

@@ -30,6 +30,7 @@
#define SUBADDRESS_H
#include <wallet/api/wallet2_api.h>
#include <QReadWriteLock>
#include <QObject>
#include <QList>
#include <QDateTime>
@@ -38,8 +39,8 @@ class Subaddress : public QObject
{
Q_OBJECT
public:
Q_INVOKABLE QList<Monero::SubaddressRow*> getAll(bool update = false) const;
Q_INVOKABLE Monero::SubaddressRow * getRow(int index) const;
Q_INVOKABLE void getAll() const;
Q_INVOKABLE bool getRow(int index, std::function<void (Monero::SubaddressRow &row)> callback) const;
Q_INVOKABLE void addRow(quint32 accountIndex, const QString &label) const;
Q_INVOKABLE void setLabel(quint32 accountIndex, quint32 addressIndex, const QString &label) const;
Q_INVOKABLE void refresh(quint32 accountIndex) const;
@@ -54,6 +55,7 @@ public slots:
private:
explicit Subaddress(Monero::Subaddress * subaddressImpl, QObject *parent);
friend class Wallet;
mutable QReadWriteLock m_lock;
Monero::Subaddress * m_subaddressImpl;
mutable QList<Monero::SubaddressRow*> m_rows;
};