maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

this is the right way to initialize the unique_hlocal_security_descriptor

Browse source
This commit is contained in:
Mike Griese 2021-11-09 07:47:12 -06:00
parent 25b2675d8d
commit b21287140d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cascadia/TerminalSettingsModel/FileUtils.cpp
View file

@ -240,7 +240,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model
const bool elevatedOnly) const bool elevatedOnly)
{ {
SECURITY_ATTRIBUTES sa; SECURITY_ATTRIBUTES sa;
// wil::unique_hlocal_security_descriptor sd; wil::unique_hlocal_security_descriptor sd;
if (elevatedOnly) if (elevatedOnly)
{ {
// // This is very vaguely taken from // // This is very vaguely taken from
@ -288,18 +288,20 @@ namespace winrt::Microsoft::Terminal::Settings::Model
// THROW_IF_WIN32_BOOL_FALSE(SetSecurityDescriptorDacl(&sd, true, pAcl, false)); // THROW_IF_WIN32_BOOL_FALSE(SetSecurityDescriptorDacl(&sd, true, pAcl, false));
unsigned long cb; unsigned long cb;
PSECURITY_DESCRIPTOR pSD{ nullptr }; //PSECURITY_DESCRIPTOR pSD{ nullptr };
ConvertStringSecurityDescriptorToSecurityDescriptor(L"S:(ML;;NW;;;HI)", ConvertStringSecurityDescriptorToSecurityDescriptor(L"S:(ML;;NW;;;HI)",
SDDL_REVISION_1, SDDL_REVISION_1,
// wil::out_param_ptr<PSECURITY_DESCRIPTOR*>(sd), wil::out_param_ptr<PSECURITY_DESCRIPTOR*>(sd),
&pSD, // &pSD,
// sd.put(),
&cb); &cb);
// Initialize a security attributes structure. // Initialize a security attributes structure.
sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.nLength = sizeof(SECURITY_ATTRIBUTES);
// sa.lpSecurityDescriptor = &sd; // sa.lpSecurityDescriptor = &sd;
// sa.lpSecurityDescriptor = sd.addressof(); sa.lpSecurityDescriptor = sd.get();
sa.lpSecurityDescriptor = pSD; // sa.lpSecurityDescriptor = pSD;
sa.bInheritHandle = false; sa.bInheritHandle = false;
} }