StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(ui): Prevent suicide crash on logout

Browse Source 
Fixes #2480

The GUI was deleting itself on logout, but was doing while deep inside the middle of GUI code, resulting in a series of use-after-free on the return path. We now freeze the GUI and logout asynchronously in a more suitable call stack.
This commit is contained in:
tux3 2016-07-03 12:49:13 +02:00
parent 9694d6b6d4
commit 2bdd9824c7
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nexus.cpp
View File

@ -258,6 +258,12 @@ bool Nexus::tryRemoveFile(const QString& filepath)
return writable;
}
void Nexus::showLoginLater()
{
GUI::setEnabled(false);
QMetaObject::invokeMethod(&getInstance(), "showLogin", Qt::QueuedConnection);
}
#ifdef Q_OS_MAC
void Nexus::retranslateUi()
{

6
src/nexus.h
View File

@ -45,7 +45,6 @@ class Nexus : public QObject
Q_OBJECT
public:
void start(); ///< Sets up invariants and calls showLogin
void showLogin(); ///< Hides the man GUI, delete the profile, and shows the login screen
/// Hides the login screen and shows the GUI for the given profile.
/// Will delete the current GUI, if it exists.
void showMainGUI();
@ -59,7 +58,12 @@ public:
static QString getSupportedImageFilter();
static bool tryRemoveFile(const QString& filepath); ///< Dangerous way to find out if a path is writable
public slots:
void showLogin(); ///< Hides the man GUI, delete the profile, and shows the login screen
void showLoginLater(); ///< Calls showLogin asynchronously, so we can safely logout from within the main GUI
#ifdef Q_OS_MAC
public:
QMenuBar* globalMenuBar;
QMenu* viewMenu;
QMenu* windowMenu;

4
src/widget/form/profileform.cpp
View File

@ -380,7 +380,7 @@ void ProfileForm::onDeleteClicked()
GUI::showError(tr("Files could not be deleted!", "deletion failed title"), message);
}
nexus.showLogin();
nexus.showLoginLater();
}
}
@ -388,7 +388,7 @@ void ProfileForm::onLogoutClicked()
{
Nexus& nexus = Nexus::getInstance();
Settings::getInstance().saveGlobal();
nexus.showLogin();
nexus.showLoginLater();
}
void ProfileForm::setPasswordButtonsText()