Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 08:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: create: FspFsvolCreateNoLock: fix open of network drive root

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-09-15 20:23:21 -07:00
parent 915279d41d
commit 74af44e2e7
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/test

@ -1 +1 @@
Subproject commit 9fe81b891b950beb81badaaba7b8fb8ab1ad92e3 Subproject commit 60f9f44b8773122bc3873b162b4136d57f60a131

14
src/sys/create.c
View File

@ -269,15 +269,21 @@ static NTSTATUS FspFsvolCreateNoLock(
if (0 == RelatedFileObject && 0 < FsvolDeviceExtension->VolumePrefix.Length) if (0 == RelatedFileObject && 0 < FsvolDeviceExtension->VolumePrefix.Length)
{ {
if (!FspFsvolDeviceVolumePrefixInString(FsvolDeviceObject, &FileNode->FileName) || if (!FspFsvolDeviceVolumePrefixInString(FsvolDeviceObject, &FileNode->FileName) ||
'\\' != FileNode->FileName.Buffer[FsvolDeviceExtension->VolumePrefix.Length / sizeof(WCHAR)]) (FileNode->FileName.Length > FsvolDeviceExtension->VolumePrefix.Length &&
'\\' != FileNode->FileName.Buffer[FsvolDeviceExtension->VolumePrefix.Length / sizeof(WCHAR)]))
{ {
FspFileNodeDereference(FileNode); FspFileNodeDereference(FileNode);
return STATUS_OBJECT_PATH_NOT_FOUND; return STATUS_OBJECT_PATH_NOT_FOUND;
} }
FileNode->FileName.Length -= FsvolDeviceExtension->VolumePrefix.Length; if (FileNode->FileName.Length > FsvolDeviceExtension->VolumePrefix.Length)
FileNode->FileName.MaximumLength -= FsvolDeviceExtension->VolumePrefix.Length; {
FileNode->FileName.Buffer += FsvolDeviceExtension->VolumePrefix.Length / sizeof(WCHAR); FileNode->FileName.Length -= FsvolDeviceExtension->VolumePrefix.Length;
FileNode->FileName.MaximumLength -= FsvolDeviceExtension->VolumePrefix.Length;
FileNode->FileName.Buffer += FsvolDeviceExtension->VolumePrefix.Length / sizeof(WCHAR);
}
else
FileNode->FileName.Length = sizeof(WCHAR);
} }
ASSERT(sizeof(WCHAR) <= FileNode->FileName.Length && L'\\' == FileNode->FileName.Buffer[0]); ASSERT(sizeof(WCHAR) <= FileNode->FileName.Length && L'\\' == FileNode->FileName.Buffer[0]);

38
tst/winfsp-tests/create-test.c
View File

@ -424,10 +424,48 @@ void create_share_test(void)
create_share_dotest(MemfsNet, L"\\\\memfs\\share"); create_share_dotest(MemfsNet, L"\\\\memfs\\share");
} }
void create_curdir_dotest(ULONG Flags, PWSTR Prefix)
{
void *memfs = memfs_start(Flags);
WCHAR CurrentDirectory[MAX_PATH], FilePath[MAX_PATH];
BOOL Success;
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s%s",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs),
Prefix ? L"" : L"\\");
Success = GetCurrentDirectoryW(MAX_PATH, CurrentDirectory);
ASSERT(Success);
Success = SetCurrentDirectoryW(FilePath);
ASSERT(Success);
Success = SetCurrentDirectoryW(CurrentDirectory);
ASSERT(Success);
memfs_stop(memfs);
}
void create_curdir_test(void)
{
if (NtfsTests)
{
WCHAR DirBuf[MAX_PATH] = L"\\\\?\\";
GetCurrentDirectoryW(MAX_PATH - 4, DirBuf + 4);
create_curdir_dotest(-1, DirBuf);
}
if (WinFspDiskTests)
create_curdir_dotest(MemfsDisk, 0);
if (WinFspNetTests)
create_curdir_dotest(MemfsNet, L"\\\\memfs\\share");
}
void create_tests(void) void create_tests(void)
{ {
TEST(create_test); TEST(create_test);
TEST(create_related_test); TEST(create_related_test);
TEST(create_sd_test); TEST(create_sd_test);
TEST(create_share_test); TEST(create_share_test);
TEST(create_curdir_test);
} }