Changeset 107377 in vbox

Timestamp:

Dec 19, 2024 9:28:00 AM (4 weeks ago)

Author:

vboxsync

Message:

IPRT/RTFileDelete-r3-nt: Fixed another regression from r162755 which prevented deleting files with specially crafted names on NT4. See comment for details. bugref:10826

File:

• trunk/src/VBox/Runtime/r3/nt/RTFileDelete-r3-nt.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/nt/RTFileDelete-r3-nt.cpp

@@ -149 +149 @@
          * grok the reparse point stuff.
          */
-        else if (rcNt == STATUS_INVALID_PARAMETER)
+        else if (   rcNt == STATUS_INVALID_PARAMETER)
         {
             fOpenOptions &= ~FILE_OPEN_REPARSE_POINT;
@@ -166 +166 @@
                                 0 /*EaLength*/);
         }
+        /*
+         * When getting STATUS_OBJECT_PATH_NOT_FOUND we re-initialize the object attributes
+         * with OBJ_CASE_INSENSITIVE and try again. This is necessary for older object managers (i.e. on NT4)
+         * when trying to delete files with a path *and* leading spaces in the file name,
+         * i.e. "c:\temp\ file_with_a_leading_space".
+         *
+         * See @bugref{10826}.
+         */
+        else if (   rcNt == STATUS_OBJECT_PATH_NOT_FOUND)
+        {
+            InitializeObjectAttributes(&ObjAttr, &NtName, OBJ_CASE_INSENSITIVE /*fAttrib*/, hRootDir, NULL);
+
+            hPath = RTNT_INVALID_HANDLE_VALUE;
+            RTNT_IO_STATUS_BLOCK_REINIT(&Ios);
+            rcNt = NtCreateFile(&hPath,
+                             DELETE | FILE_READ_ATTRIBUTES | SYNCHRONIZE,
+                             &ObjAttr,
+                             &Ios,
+                             NULL /*AllocationSize*/,
+                             FILE_ATTRIBUTE_NORMAL,
+                             FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
+                             FILE_OPEN,
+                             fOpenOptions,
+                             NULL /*EaBuffer*/,
+                             0 /*EaLength*/);
+        }
+
         /* else:
            DeleteFileW will retry opening the file w/o FILE_READ_ATTRIBUTES here when
@@ -210 +237 @@
             if (!NT_SUCCESS(rcNt) && RT_SUCCESS_NP(rc))
                 rc = RTErrConvertFromNtStatus(rcNt);
-            }
+        }
         else if (RT_SUCCESS_NP(rc))
             rc = RTErrConvertFromNtStatus(rcNt);