From f94dd14c45ead99d84ec84bc4460ff470d83fc38 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Wed, 7 Dec 2016 13:25:02 -0800 Subject: [PATCH] win: fix SECURITY_DESCRIPTOR builder on vs2013 After https://chromium.googlesource.com/crashpad/crashpad/+/5b83e587. R=mark@chromium.org BUG=chromium:655788,chromium:656800 Change-Id: Ic33b9daedc340bfce3cc4ddde4eb4c93f68e7ad0 Reviewed-on: https://chromium-review.googlesource.com/417412 Reviewed-by: Mark Mentovai --- util/win/registration_protocol_win.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/util/win/registration_protocol_win.cc b/util/win/registration_protocol_win.cc index ebadd60f..b270d24c 100644 --- a/util/win/registration_protocol_win.cc +++ b/util/win/registration_protocol_win.cc @@ -166,8 +166,8 @@ const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size) { { ACL_REVISION, // AclRevision. 0, // Sbz1. - sizeof(SecurityDescriptorBlob::sacl), // AclSize. - arraysize(SecurityDescriptorBlob::sacl.ace), // AceCount. + sizeof(kSecDescBlob.sacl), // AclSize. + arraysize(kSecDescBlob.sacl.ace), // AceCount. 0, // Sbz2. }, @@ -178,7 +178,7 @@ const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size) { { SYSTEM_MANDATORY_LABEL_ACE_TYPE, // AceType. 0, // AceFlags. - sizeof(SecurityDescriptorBlob::sacl.ace[0]), // AceSize. + sizeof(kSecDescBlob.sacl.ace[0]), // AceSize. }, // mask. @@ -188,8 +188,7 @@ const void* GetSecurityDescriptorForNamedPipeInstance(size_t* size) { { SID_REVISION, // Revision. // SubAuthorityCount. - arraysize( - SecurityDescriptorBlob::sacl.ace[0].sid.SubAuthority), + arraysize(kSecDescBlob.sacl.ace[0].sid.SubAuthority), // IdentifierAuthority. SECURITY_MANDATORY_LABEL_AUTHORITY, {SECURITY_MANDATORY_UNTRUSTED_RID}, // SubAuthority.