From dcc7c2dbf2fe8beacd3ed5918b235c15df57d4d5 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 2 Sep 2026 18:07:09 +0200 Subject: [PATCH] fix: avoid warning by not calling joinPath with invalid parameters Signed-off-by: Matthieu Gallien --- src/common/filesystembase.cpp | 3 +++ src/libsync/owncloudpropagator.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/common/filesystembase.cpp b/src/common/filesystembase.cpp index fae1f186fe956..d29bd6b49a017 100644 --- a/src/common/filesystembase.cpp +++ b/src/common/filesystembase.cpp @@ -314,6 +314,9 @@ bool FileSystem::openAndSeekFileSharedRead(QFile *file, QString *errorOrNull, qi QString FileSystem::joinPath(const QString& path, const QString& file) { + Q_ASSERT(!path.isEmpty()); + Q_ASSERT(!file.isEmpty()); + if (path.isEmpty()) { qCWarning(lcFileSystem).nospace() << "joinPath called with an empty path; returning file=" << file; return QDir::toNativeSeparators(file); diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 91254741c61dc..a221e7d5f1894 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -1555,8 +1555,10 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status) if (const auto fileName = propagator()->fullLocalPath(_item->_file); FileSystem::fileExists(fileName)) { permissionsChangeHelper(fileName); } - if (const auto fileName = propagator()->fullLocalPath(_item->_renameTarget); !_item->_renameTarget.isEmpty() && FileSystem::fileExists(fileName)) { - permissionsChangeHelper(fileName); + if (!_item->_renameTarget.isEmpty()) { + if (const auto fileName = propagator()->fullLocalPath(_item->_renameTarget); FileSystem::fileExists(fileName)) { + permissionsChangeHelper(fileName); + } } } catch (const std::filesystem::filesystem_error &e)