Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-07-03 17:32:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: FspUnicodePathIsValid: improvements

Browse Source
This commit is contained in:
Bill Zissimopoulos
2016-09-25 21:38:41 -07:00
parent 687b02c1e6
commit 7cb56bb132
4 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sys/create.c
View File

@ -134,6 +134,7 @@ static NTSTATUS FspFsvolCreateNoLock(
PFILE_OBJECT FileObject = IrpSp->FileObject;
PFILE_OBJECT RelatedFileObject = FileObject->RelatedFileObject;
UNICODE_STRING FileName = FileObject->FileName;
UNICODE_STRING MainStreamName = { 0 }, StreamPart = { 0 };
/* open the volume object? */
if ((0 == RelatedFileObject || !FspFileNodeIsValid(RelatedFileObject->FsContext)) &&
@ -211,9 +212,27 @@ static NTSTATUS FspFsvolCreateNoLock(
}
/* check filename validity */
if (!FspUnicodePathIsValid(&FileName, 0 != FsvolDeviceExtension->VolumeParams.NamedStreams))
if (!FspUnicodePathIsValid(&FileName,
FsvolDeviceExtension->VolumeParams.NamedStreams ? &StreamPart : 0))
return STATUS_OBJECT_NAME_INVALID;
/* if we have a stream part */
if (0 != StreamPart.Buffer)
{
ASSERT(
FileName.Buffer <= StreamPart.Buffer &&
StreamPart.Buffer + StreamPart.Length / sizeof(WCHAR) <=
FileName.Buffer + FileName.Length / sizeof(WCHAR));
FileName.Length = (USHORT)
(((PUINT8)StreamPart.Buffer + StreamPart.Length / sizeof(WCHAR)) -
(PUINT8)FileName.Buffer - 1);
MainStreamName.Length = MainStreamName.MaximumLength = (USHORT)
((PUINT8)StreamPart.Buffer - (PUINT8)FileName.Buffer - 1);
MainStreamName.Buffer = FileName.Buffer;
}
/* is this a relative or absolute open? */
if (0 != RelatedFileObject)
{