Skip to content
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

Fix VFX Windows .lnk files freeze/crash issue #3057

Merged
merged 8 commits into from
Apr 7, 2021
Merged

Fix VFX Windows .lnk files freeze/crash issue #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5b6d93
Fix VFS freeze when syncing '.lnk' files on Windows.
allexzander Mar 31, 2021
7235c70
Added .lnk file placeholder creation fix.
allexzander Mar 31, 2021
3906ae0
Another way to fix this.
allexzander Mar 31, 2021
13f4bb5
Treat .lnk files as normal files without hydrating them or creating a…
allexzander Apr 1, 2021
cb8b6cc
Ignore *.lnk files on Windows.
allexzander Apr 1, 2021
de85b79
Address review comments.
allexzander Apr 5, 2021
82953d0
Fix review comments.
allexzander Apr 6, 2021
4b58c2b
Fix review comments.
allexzander Apr 7, 2021
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: 2 additions & 1 deletion src/csync/vio/csync_vio_local_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *h
} else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
file_stat->type = ItemTypeDirectory;
} else {
file_stat->type = ItemTypeFile;
// exclude ".lnk" files as they are not essential, but, causing troubles when enabling the VFS due to QFileInfo::isDir() and other methods are freezing, which causes the ".lnk" files to start hydrating and freezing the app eventually.
file_stat->type = !OCC::FileSystem::isLnkFile(path) ? ItemTypeFile : ItemTypeSoftLink;
}

/* Check for the hidden flag */
Expand Down
9 changes: 8 additions & 1 deletion src/libsync/discovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

#include "discovery.h"
#include "common/filesystembase.h"
#include "common/syncjournaldb.h"
#include "syncfileitem.h"
#include <QDebug>
Expand Down Expand Up @@ -177,9 +178,15 @@ void ProcessDirectoryJob::process()
// local stat function.
// Recall file shall not be ignored (#4420)
bool isHidden = e.localEntry.isHidden || (f.first[0] == '.' && f.first != QLatin1String(".sys.admin#recall#"));
#ifdef Q_OS_WIN
// exclude ".lnk" files as they are not essential, but, causing troubles when enabling the VFS due to QFileInfo::isDir() and other methods are freezing, which causes the ".lnk" files to start hydrating and freezing the app eventually.
const bool isServerEntryWindowsShortcut = !e.localEntry.isValid() && e.serverEntry.isValid() && !e.serverEntry.isDirectory && FileSystem::isLnkFile(e.serverEntry.name);
#else
const bool isServerEntryWindowsShortcut = false;
#endif
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it is a good idea to move the preprocessor conditionals into the FileSystem::isLnkFile() method? That would simplify the logic a bit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FlexW
In this case, I wouldn't do that, cause, "isLnkFile" can be used on other platforms too.

if (handleExcluded(path._target, e.localEntry.name,
e.localEntry.isDirectory || e.serverEntry.isDirectory, isHidden,
e.localEntry.isSymLink))
e.localEntry.isSymLink || isServerEntryWindowsShortcut))
continue;

if (_queryServer == InBlackList || _discoveryData->isInSelectiveSyncBlackList(path._original)) {
Expand Down
4 changes: 3 additions & 1 deletion src/libsync/vfs/cfapi/vfs_cfapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ bool VfsCfApi::statTypeVirtualFile(csync_file_stat_t *stat, void *statData)
const auto hasReparsePoint = (ffd->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
const auto hasCloudTag = (ffd->dwReserved0 & IO_REPARSE_TAG_CLOUD) != 0;

const auto isWindowsShortcut = !isDirectory && FileSystem::isLnkFile(stat->path);

// It's a dir with a reparse point due to the placeholder info (hence the cloud tag)
// if we don't remove the reparse point flag the discovery will end up thinking
// it is a file... let's prevent it
Expand All @@ -195,7 +197,7 @@ bool VfsCfApi::statTypeVirtualFile(csync_file_stat_t *stat, void *statData)
} else if (isSparseFile && isPinned) {
stat->type = ItemTypeVirtualFileDownload;
return true;
} else if (!isSparseFile && isUnpinned){
} else if (!isSparseFile && isUnpinned && !isWindowsShortcut){
stat->type = ItemTypeVirtualFileDehydration;
return true;
} else if (isSparseFile) {
Expand Down