Skip to content

[llvm][Support][Windows] Avoid crash calling remove_directories() #118677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 12, 2024
Merged

[llvm][Support][Windows] Avoid crash calling remove_directories() #118677

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc5973d
[Windows] Avoid crash calling remove_directories()
slydiman Dec 4, 2024
3fa9272
Updated with the behavior of SHFileOperationW().
slydiman Dec 4, 2024
2cb0548
Refactored.
slydiman Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions llvm/lib/Support/Windows/Path.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
// These two headers must be included last, and make sure shlobj is required
// after Windows.h to make sure it picks up our definition of _WIN32_WINNT
#include "llvm/Support/Windows/WindowsSupport.h"
#include <atlbase.h>
#include <shellapi.h>
#include <shlobj.h>

Expand Down Expand Up @@ -1387,14 +1388,33 @@ std::error_code remove_directories(const Twine &path, bool IgnoreErrors) {
Path16.push_back(0);
Path16.push_back(0);

SHFILEOPSTRUCTW shfos = {};
shfos.wFunc = FO_DELETE;
shfos.pFrom = Path16.data();
shfos.fFlags = FOF_NO_UI;

int result = ::SHFileOperationW(&shfos);
if (result != 0 && !IgnoreErrors)
return mapWindowsError(result);
HRESULT HR;
do {
HR =
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
if (FAILED(HR))
break;
auto Uninitialize = make_scope_exit([] { CoUninitialize(); });
CComPtr<IFileOperation> FileOp;
HR = FileOp.CoCreateInstance(CLSID_FileOperation);
if (FAILED(HR))
break;
HR = FileOp->SetOperationFlags(FOF_NO_UI | FOFX_NOCOPYHOOKS);
if (FAILED(HR))
break;
PIDLIST_ABSOLUTE PIDL = ILCreateFromPathW(Path16.data());
auto FreePIDL = make_scope_exit([&PIDL] { ILFree(PIDL); });
CComPtr<IShellItem> ShItem;
HR = SHCreateItemFromIDList(PIDL, IID_PPV_ARGS(&ShItem));
if (FAILED(HR))
break;
HR = FileOp->DeleteItem(ShItem, NULL);
if (FAILED(HR))
break;
HR = FileOp->PerformOperations();
} while (false);
if (FAILED(HR) && !IgnoreErrors)
return mapWindowsError(HRESULT_CODE(HR));
return std::error_code();
}

Expand Down
Loading