Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Windows Setup: Avoid potential issues by correctly initializing variables and checking memory allocation.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-03-19 13:06:19 +01:00
parent 474505d704
commit a5203dd006
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Setup/Setup.c
View File

@@ -202,17 +202,15 @@ static void RecursiveSetDACL (HKEY hKey, const char* SubKeyName, PSECURITY_DESCR
static void AllowKeyAccess(HKEY Key,const char* SubKeyName) static void AllowKeyAccess(HKEY Key,const char* SubKeyName)
{ {
LSTATUS RegResult; LSTATUS RegResult;
HKEY SvcKey; HKEY SvcKey = NULL;
DWORD dwLength; DWORD dwLength = 0;
HANDLE Token = NULL; HANDLE Token = NULL;
PTOKEN_USER pTokenUser; PTOKEN_USER pTokenUser = NULL;
std::string sNewSD; std::string sNewSD;
RegResult = RegOpenKeyExA(Key, SubKeyName, 0, WRITE_OWNER | KEY_READ, &SvcKey); RegResult = RegOpenKeyExA(Key, SubKeyName, 0, WRITE_OWNER | KEY_READ, &SvcKey);
if (RegResult==ERROR_SUCCESS) if (RegResult==ERROR_SUCCESS)
{ {
dwLength=0;
pTokenUser = NULL;
if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token)) if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token))
{ {
if (!GetTokenInformation(Token, TokenUser, pTokenUser, 0, &dwLength)) if (!GetTokenInformation(Token, TokenUser, pTokenUser, 0, &dwLength))
@@ -246,22 +244,24 @@ static void AllowKeyAccess(HKEY Key,const char* SubKeyName)
PSID pSid = pTokenUser->User.Sid; PSID pSid = pTokenUser->User.Sid;
DWORD dwAclSize = sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + ::GetLengthSid(pSid) - sizeof(DWORD); DWORD dwAclSize = sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + ::GetLengthSid(pSid) - sizeof(DWORD);
PACL pDacl = (PACL) new BYTE[dwAclSize]; PACL pDacl = (PACL) new BYTE[dwAclSize];
if (pDacl)
if (TRUE == ::InitializeAcl(pDacl, dwAclSize, ACL_REVISION))
{ {
if (TRUE == AddAccessAllowedAceEx(pDacl, ACL_REVISION, CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, WRITE_DAC | KEY_ALL_ACCESS, pSid)) if (TRUE == ::InitializeAcl(pDacl, dwAclSize, ACL_REVISION))
{ {
SECURITY_DESCRIPTOR SecDesc; if (TRUE == AddAccessAllowedAceEx(pDacl, ACL_REVISION, CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, WRITE_DAC | KEY_ALL_ACCESS, pSid))
if (TRUE == ::InitializeSecurityDescriptor(&SecDesc, SECURITY_DESCRIPTOR_REVISION))
{ {
if (TRUE == ::SetSecurityDescriptorDacl(&SecDesc, TRUE, pDacl, FALSE)) SECURITY_DESCRIPTOR SecDesc;
if (TRUE == ::InitializeSecurityDescriptor(&SecDesc, SECURITY_DESCRIPTOR_REVISION))
{ {
RecursiveSetDACL (Key, SubKeyName, &SecDesc); if (TRUE == ::SetSecurityDescriptorDacl(&SecDesc, TRUE, pDacl, FALSE))
{
RecursiveSetDACL (Key, SubKeyName, &SecDesc);
}
} }
} }
} }
delete [] pDacl;
} }
delete [] pDacl;
} }
if (pTokenUser) if (pTokenUser)