Skip to content

fix: avoid warning by not calling joinPath with invalid parameters #10724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgallien wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

fix: avoid warning by not calling joinPath with invalid parameters #10724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/common/filesystembase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions src/libsync/owncloudpropagator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading