Changeset 79155 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Jun 14, 2019 4:33:05 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rtFsModeFromDos: Pass desired object type when normalizing mode masks where the type is implicit (e.g. RTDirCreate). ticketref:18345 bugref:9172

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -1322 +1322 @@
     AssertReturn(pThis->uMagic == RTVFSOBJ_MAGIC, VERR_INVALID_HANDLE);
 
-    fMode = rtFsModeNormalize(fMode, NULL, 0);
+    fMode = rtFsModeNormalize(fMode, NULL, 0, 0);
     if (!rtFsModeIsValid(fMode))
         return VERR_INVALID_PARAMETER;
@@ -2749 +2749 @@
     AssertPtrNullReturn(phVfsDir, VERR_INVALID_POINTER);
     AssertReturn(!(fFlags & ~RTDIRCREATE_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
-    fMode = rtFsModeNormalize(fMode, pszRelPath, 0);
+    fMode = rtFsModeNormalize(fMode, pszRelPath, 0, RTFS_TYPE_DIRECTORY);
     AssertReturn(rtFsModeIsValidPermissions(fMode), VERR_INVALID_FMODE);
     if (!(fFlags & RTDIRCREATE_FLAGS_NOT_CONTENT_INDEXED_DONT_SET))
@@ -3302 +3302 @@
     AssertReturn(pThis->uMagic == RTVFSSYMLINK_MAGIC, VERR_INVALID_HANDLE);
 
-    fMode = rtFsModeNormalize(fMode, NULL, 0);
+    fMode = rtFsModeNormalize(fMode, NULL, 0, RTFS_TYPE_SYMLINK);
     if (!rtFsModeIsValid(fMode))
         return VERR_INVALID_PARAMETER;