Do not follow junctions when recursively deleting directories

This will prevent elevated processes from accidentally following a junction from a user-writable directory to a per-machine directory and erroneously deleting the per-machine contents.
wixtoolset · Feb 6, 2024 · cb77605 · cb77605
1 parent ea94ed0
commit cb77605
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libs/dutil/dirutil.cpp b/src/libs/dutil/dirutil.cpp
@@ -210,8 +210,8 @@ extern "C" HRESULT DAPI DirEnsureDeleteEx(
             }
         }
 
-        // If we're deleting files and/or child directories loop through the contents of the directory.
-        if (fDeleteFiles || fRecurse)
+        // If we're deleting files and/or child directories loop through the contents of the directory, but skip junctions.
+        if ((fDeleteFiles || fRecurse) && (0 == (dwAttrib & FILE_ATTRIBUTE_REPARSE_POINT)))
         {
             if (fScheduleDelete)
             {