From 21035d48a69a7b14ea4e8c0ff99e1b3e5c94e5bf Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 25 Jan 2021 18:02:42 +0100 Subject: [PATCH] Don't crash when the same request is filled twice The OS might request the same file again if we take too much time to fulfill a request. So in case it's queueing the same one again instead of bailing out just fail the second one and let the first one finish properly. Signed-off-by: Kevin Ottens --- src/libsync/vfs/cfapi/vfs_cfapi.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libsync/vfs/cfapi/vfs_cfapi.cpp b/src/libsync/vfs/cfapi/vfs_cfapi.cpp index 7a5da1e0ed..be0eb5f239 100644 --- a/src/libsync/vfs/cfapi/vfs_cfapi.cpp +++ b/src/libsync/vfs/cfapi/vfs_cfapi.cpp @@ -307,9 +307,15 @@ void VfsCfApi::fileStatusChanged(const QString &systemFileName, SyncFileStatus f void VfsCfApi::scheduleHydrationJob(const QString &requestId, const QString &folderPath) { - Q_ASSERT(std::none_of(std::cbegin(d->hydrationJobs), std::cend(d->hydrationJobs), [=](HydrationJob *job) { + const auto jobAlreadyScheduled = std::any_of(std::cbegin(d->hydrationJobs), std::cend(d->hydrationJobs), [=](HydrationJob *job) { return job->requestId() == requestId || job->folderPath() == folderPath; - })); + }); + + if (jobAlreadyScheduled) { + qCWarning(lcCfApi) << "The OS submitted again a hydration request which is already on-going" << requestId << folderPath; + emit hydrationRequestFailed(requestId); + return; + } if (d->hydrationJobs.isEmpty()) { emit beginHydrating();