Fix crash

Fixes: #9600
owncloud · Apr 26, 2022 · 8d0dd36 · 8d0dd36
1 parent c5cc5a6
commit 8d0dd36
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/changelog/unreleased/9600 b/changelog/unreleased/9600
@@ -0,0 +1,5 @@
+Bugfix: Crash when interacting with a folder in an error state
+
+We fixed a crash wher using the context menu on a folder that encountered an error and was not using virutal files.
+
+https://github.com/owncloud/client/issues/9600
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -599,6 +599,7 @@ int Folder::slotWipeErrorBlacklist()
 
 void Folder::slotWatchedPathChanged(const QString &path, ChangeReason reason)
 {
+    Q_ASSERT(isReady());
     if (!FileSystem::isChildPathOf(path, this->path())) {
         qCDebug(lcFolder) << "Changed path is not contained in folder, ignoring:" << path;
         return;
@@ -809,22 +810,25 @@ void Folder::removeFromSettings() const
 
 bool Folder::isFileExcludedAbsolute(const QString &fullPath) const
 {
+    if (!_engine) {
+        return true;
+    }
     return _engine->excludedFiles().isExcluded(fullPath, path(), _definition.ignoreHiddenFiles);
 }
 
 bool Folder::isFileExcludedRelative(const QString &relativePath) const
 {
-    return _engine->excludedFiles().isExcluded(path() + relativePath, path(), _definition.ignoreHiddenFiles);
+    return isFileExcludedAbsolute(path() + relativePath);
 }
 
 void Folder::slotTerminateSync()
 {
-    qCInfo(lcFolder) << "folder " << alias() << " Terminating!";
-
-    if (_engine->isSyncRunning()) {
-        _engine->abort();
-
-        setSyncState(SyncResult::SyncAbortRequested);
+    if (isReady()) {
+        qCInfo(lcFolder) << "folder " << alias() << " Terminating!";
+        if (_engine->isSyncRunning()) {
+            _engine->abort();
+            setSyncState(SyncResult::SyncAbortRequested);
+        }
     }
 }
 
@@ -875,6 +879,9 @@ void Folder::wipeForRemoval()
 
 bool Folder::reloadExcludes()
 {
+    if (!_engine) {
+        return true;
+    }
     return _engine->excludedFiles().reloadExcludeFiles();
 }
 
@@ -941,6 +948,7 @@ void Folder::startSync()
 
 void Folder::setSyncOptions()
 {
+    Q_ASSERT(isReady());
     SyncOptions opt;
     ConfigFile cfgFile;
 
@@ -964,6 +972,7 @@ void Folder::setSyncOptions()
 
 void Folder::setDirtyNetworkLimits()
 {
+    Q_ASSERT(isReady());
     ConfigFile cfg;
     int downloadLimit = -75; // 75%
     int useDownLimit = cfg.useDownloadLimit();
@@ -999,6 +1008,7 @@ void Folder::slotSyncStarted()
 
 void Folder::slotSyncFinished(bool success)
 {
+    Q_ASSERT(isReady());
     qCInfo(lcFolder) << "Client version" << Theme::instance()->aboutVersions(Theme::VersionFormat::OneLiner);
 
     bool syncError = !_syncResult.errorStrings().isEmpty();

diff --git a/src/gui/folder.h b/src/gui/folder.h
@@ -230,8 +230,16 @@ class Folder : public QObject
     void setIgnoreHiddenFiles(bool ignore);
 
     // Used by the Socket API
-    SyncJournalDb *journalDb() { return &_journal; }
-    SyncEngine &syncEngine() { return *_engine; }
+    SyncJournalDb *journalDb()
+    {
+        Q_ASSERT(isReady());
+        return &_journal;
+    }
+    SyncEngine &syncEngine()
+    {
+        Q_ASSERT(isReady());
+        return *_engine;
+    }
     Vfs &vfs()
     {
         OC_ENFORCE(_vfs);

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
@@ -553,6 +553,9 @@ bool FolderStatusModel::canFetchMore(const QModelIndex &parent) const
 
 void FolderStatusModel::fetchMore(const QModelIndex &parent)
 {
+    if (!data(parent, FolderStatusDelegate::IsReady).toBool()) {
+        return;
+    }
     auto info = infoForIndex(parent);
 
     if (!info || info->_fetched || info->_fetchingJob)

diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp
@@ -120,10 +120,12 @@ void IgnoreListEditor::slotUpdateLocalIgnoreList()
     // Otherwise we would not download the files/directories that are no longer
     // ignored (because the remote etag did not change)   (issue #3172)
     for (auto *folder : folderMan->map()) {
-        folder->journalDb()->forceRemoteDiscoveryNextSync();
-        folder->reloadExcludes();
-        folder->slotNextSyncFullLocalDiscovery();
-        folderMan->scheduleFolder(folder);
+        if (folder->isReady()) {
+            folder->journalDb()->forceRemoteDiscoveryNextSync();
+            folder->reloadExcludes();
+            folder->slotNextSyncFullLocalDiscovery();
+            folderMan->scheduleFolder(folder);
+        }
     }
 }