Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 18:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SERVICES]

Browse source 
Check for NULL pointers before derreferecing them in ScmIsSameServiceAccount().
Patch by Victor Martinez Calvo.
CORE-11599 #resolve #comment Thanks a lot!

svn path=/trunk/; revision=71954
This commit is contained in:
Eric Kohl 2016-07-16 17:39:37 +00:00
parent 1ef04bbe0a
commit 949bd4b625
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/base/system/services/database.c
View file

@ -162,10 +162,16 @@ ScmIsSameServiceAccount(
IN PWSTR pszAccountName1,
IN PWSTR pszAccountName2)
{
if ((pszAccountName1 == NULL && pszAccountName2 == NULL) ||
(pszAccountName1 == NULL && wcscmp(pszAccountName2, L"LocalSystem") == 0) ||
(pszAccountName2 == NULL && wcscmp(pszAccountName1, L"LocalSystem") == 0) ||
(wcscmp(pszAccountName1, pszAccountName2) == 0))
if (pszAccountName1 == NULL && pszAccountName2 == NULL)
return TRUE;
if (pszAccountName1 == NULL && pszAccountName2 && wcscmp(pszAccountName2, L"LocalSystem") == 0)
return TRUE;
if (pszAccountName2 == NULL && pszAccountName1 && wcscmp(pszAccountName1, L"LocalSystem") == 0)
return TRUE;
if (pszAccountName1 && pszAccountName2 && wcscmp(pszAccountName1, pszAccountName2) == 0)
return TRUE;
return FALSE;
@ -196,9 +202,9 @@ ScmLogonService(
PWSTR ptr;
DWORD dwError = ERROR_SUCCESS;
DPRINT("ScmLogonService()\n");
DPRINT1("ScmLogonService()\n");
DPRINT("Service %S\n", pService->lpServiceName);
DPRINT1("Service %S\n", pService->lpServiceName);
if (ScmIsLocalSystemAccount(pImage->pszAccountName))
return ERROR_SUCCESS;
@ -222,10 +228,10 @@ ScmLogonService(
// pDomainName = computer name
}
DPRINT("Domain: %S User: %S\n", pDomainName, pUserName);
DPRINT1("Domain: %S User: %S\n", pDomainName, pUserName);
/* FIXME */
#if 0
#if 1
if (!LogonUserW(pUserName,
pDomainName,
L"", // lpszPassword,