Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-13 16:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

FDO Secrets: Fix double free on exit

Browse Source 
* Prevent double free due to QObject cleanup happening before/after the ExtraPage  storing the QSharedPointer to FdoSecretsPlugin is deleted.
* Fixes #4877
This commit is contained in:
Jonathan White 2020-06-19 18:25:59 -04:00
parent c46f3d37b1
commit 736df7696f
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fdosecrets/FdoSecretsPlugin.cpp
View File

@ -30,13 +30,21 @@
using FdoSecrets::Service;
// TODO: Only used for testing. Need to split service functions away from settings page.
QPointer<FdoSecretsPlugin> g_fdoSecretsPlugin;
FdoSecretsPlugin::FdoSecretsPlugin(DatabaseTabWidget* tabWidget)
: QObject(tabWidget)
, m_dbTabs(tabWidget)
: m_dbTabs(tabWidget)
{
g_fdoSecretsPlugin = this;
FdoSecrets::registerDBusTypes();
}
FdoSecretsPlugin* FdoSecretsPlugin::getPlugin()
{
return g_fdoSecretsPlugin;
}
QWidget* FdoSecretsPlugin::createWidget()
{
return new SettingsWidgetFdoSecrets(this);

3
src/fdosecrets/FdoSecretsPlugin.h
View File

@ -70,6 +70,9 @@ public:
*/
QString reportExistingService() const;
// TODO: Only used for testing. Need to split service functions away from settings page.
static FdoSecretsPlugin* getPlugin();
public slots:
void emitRequestSwitchToDatabases();
void emitRequestShowNotification(const QString& msg, const QString& title = {});

2
tests/gui/TestGuiFdoSecrets.cpp
View File

@ -200,7 +200,7 @@ void TestGuiFdoSecrets::initTestCase()
m_mainWindow.reset(new MainWindow());
m_tabWidget = m_mainWindow->findChild<DatabaseTabWidget*>("tabWidget");
QVERIFY(m_tabWidget);
m_plugin = m_mainWindow->findChild<FdoSecretsPlugin*>();
m_plugin = FdoSecretsPlugin::getPlugin();
QVERIFY(m_plugin);
m_mainWindow->show();