mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-20 13:44:12 +02:00
Merge pull request #512 from ispyisail/fix-492-backup-uaf
Although I haven’t encountered the problems described myself (nor do I need to!), the changes and additions look plausible and compile without errors or warnings, so I’m approving this PR! But as a remark: I'm not particularly familiar with the Qt functions used here. But when I see that there is a version-specific implementation for Qt5 and only a debug-message mentioned for Qt6, it makes me wonder: Is it implemented differently there, or is it not even needed there — which I don't think is the case... If possible, "we" should also include something for Qt6 and later versions in another PR. Do you know what’s needed for Qt6, @ispyisail ?
This commit is contained in:
+12
-1
@@ -137,6 +137,11 @@ QETProject::QETProject(KAutoSaveFile *backup, QObject *parent) :
|
|||||||
*/
|
*/
|
||||||
QETProject::~QETProject()
|
QETProject::~QETProject()
|
||||||
{
|
{
|
||||||
|
//Wait for any in-flight async crash-recovery backup to finish: the worker
|
||||||
|
//writes through &m_backup_file, a member that would otherwise be destroyed
|
||||||
|
//under it (issue #492).
|
||||||
|
m_backup_future.waitForFinished();
|
||||||
|
|
||||||
//We block database signal to avoid hundreds of unnecessary emitted signal
|
//We block database signal to avoid hundreds of unnecessary emitted signal
|
||||||
//due to deletion (diagram, item, etc...) and as much update made in the not yet deleted things.
|
//due to deletion (diagram, item, etc...) and as much update made in the not yet deleted things.
|
||||||
m_data_base.blockSignals(true);
|
m_data_base.blockSignals(true);
|
||||||
@@ -339,6 +344,8 @@ void QETProject::setFilePath(const QString &filepath)
|
|||||||
}
|
}
|
||||||
#ifdef BUILD_WITHOUT_KF5
|
#ifdef BUILD_WITHOUT_KF5
|
||||||
#else
|
#else
|
||||||
|
//Don't close/re-point the backup file while a backup is still writing it.
|
||||||
|
m_backup_future.waitForFinished();
|
||||||
if (m_backup_file.isOpen()) {
|
if (m_backup_file.isOpen()) {
|
||||||
m_backup_file.close();
|
m_backup_file.close();
|
||||||
}
|
}
|
||||||
@@ -1809,8 +1816,12 @@ void QETProject::writeBackup()
|
|||||||
#ifdef BUILD_WITHOUT_KF5
|
#ifdef BUILD_WITHOUT_KF5
|
||||||
#else
|
#else
|
||||||
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
|
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
|
||||||
|
//Don't launch a new backup while the previous one is still writing:
|
||||||
|
//both would write through &m_backup_file on different threads.
|
||||||
|
if (m_backup_future.isRunning())
|
||||||
|
return;
|
||||||
QDomDocument xml_project(toXml());
|
QDomDocument xml_project(toXml());
|
||||||
QtConcurrent::run(
|
m_backup_future = QtConcurrent::run(
|
||||||
QET::writeToFile,xml_project,&m_backup_file,nullptr);
|
QET::writeToFile,xml_project,&m_backup_file,nullptr);
|
||||||
# else
|
# else
|
||||||
# if TODO_LIST
|
# if TODO_LIST
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
#include <QFuture>
|
||||||
|
|
||||||
class Diagram;
|
class Diagram;
|
||||||
class ElementsLocation;
|
class ElementsLocation;
|
||||||
@@ -295,6 +296,7 @@ class QETProject : public QObject
|
|||||||
bool m_freeze_new_conductors = false;
|
bool m_freeze_new_conductors = false;
|
||||||
QTimer m_save_backup_timer,
|
QTimer m_save_backup_timer,
|
||||||
m_autosave_timer;
|
m_autosave_timer;
|
||||||
|
QFuture<bool> m_backup_future;
|
||||||
#ifdef BUILD_WITHOUT_KF5
|
#ifdef BUILD_WITHOUT_KF5
|
||||||
#else
|
#else
|
||||||
KAutoSaveFile m_backup_file;
|
KAutoSaveFile m_backup_file;
|
||||||
|
|||||||
Reference in New Issue
Block a user