Skip to content

msi\setup.exe: Fix a handle leak #370

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

Open
RatinCN wants to merge 1 commit into
base: main
Choose a base branch
from
Open

msi\setup.exe: Fix a handle leak #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Samples/Win7Samples/sysmgmt/msi/setup.exe/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,10 +705,12 @@ bool AcquireShutdownPrivilege()
// cannot test return value of AdjustTokenPrivileges
if (ERROR_SUCCESS != WIN::GetLastError())
{
CloseHandle(hToken);
Copy link
Member

@ChrisGuzak ChrisGuzak Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix looks correct, using wil::unique_handle (is there wil::unique_htoken?) and RAII for all of the resource lifetimes would simplify further.

Copy link
Author

@RatinCN RatinCN Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code is too old, I guess here wil is unavailable, but that doesn't matter, an explicit call to CloseHandle can emphasize that it needs to be released. As an example, I think it is more important to show how to use this API.

FreeLibrary(hAdvapi32);
return false;
}

CloseHandle(hToken);
FreeLibrary(hAdvapi32);

return true;
Expand Down