Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2017-02-27 19:09:29 +0300
committerMarkus Goetz <markus@woboq.com>2017-02-27 19:09:29 +0300
commit384f18da3895251fbfc8f69ca02e65db6e8728b7 (patch)
tree4348ec5d2aab6e23c1923e472ca90a036066baf4
parent75e06c25c70303ecdefc35644f5c4e19b74693d4 (diff)
Potential fix for crash in PropagateDirectory::abort (#5564)
-rw-r--r--src/libsync/owncloudpropagator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index f54d57a33..6e73c0d5d 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -661,8 +661,10 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status)
_firstJob.take();
} else {
int i = _subJobs.indexOf(subJob);
+ // Shouldn't happen but could be -1 if finished was emitted twice for a job.
ASSERT(i >= 0);
- _subJobs.remove(i);
+ if (i >= 0)
+ _subJobs.remove(i);
}
if (status == SyncFileItem::FatalError ||