Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVAPI32]

Browse source 
Remove unneeded NULL checks at CreateServiceA/W and ChangeServiceConfigW/A().
Patch by Victor Martinez Calvo.
CORE-11610 #resolve #comment Thanks a lot!

svn path=/trunk/; revision=71953
This commit is contained in:
Eric Kohl 2016-07-16 16:18:17 +00:00
parent 50df31709e
commit 1ef04bbe0a
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/dll/win32/advapi32/service/scm.c
View file

@ -326,7 +326,7 @@ ChangeServiceConfigA(SC_HANDLE hService,
/* FIXME: Encrypt the password */
lpEncryptedPassword = (LPBYTE)lpPasswordW;
dwPasswordLength = (DWORD)(lpPasswordW ? (wcslen(lpPasswordW) + 1) * sizeof(WCHAR) : 0);
dwPasswordLength = (wcslen(lpPasswordW) + 1) * sizeof(WCHAR);
}
RpcTryExcept
@ -407,9 +407,12 @@ ChangeServiceConfigW(SC_HANDLE hService,
dwDependenciesLength *= sizeof(WCHAR);
}
/* FIXME: Encrypt the password */
lpEncryptedPassword = (LPBYTE)lpPassword;
dwPasswordLength = (lpPassword ? (wcslen(lpPassword) + 1) * sizeof(WCHAR) : 0);
if (lpPassword != NULL)
{
/* FIXME: Encrypt the password */
lpEncryptedPassword = (LPBYTE)lpPassword;
dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR);
}
RpcTryExcept
{
@ -619,7 +622,7 @@ CreateServiceA(SC_HANDLE hSCManager,
/* FIXME: Encrypt the password */
lpEncryptedPassword = (LPBYTE)lpPasswordW;
dwPasswordLength = (DWORD)(lpPasswordW ? (wcslen(lpPasswordW) + 1) * sizeof(WCHAR) : 0);
dwPasswordLength = (wcslen(lpPasswordW) + 1) * sizeof(WCHAR);
}
RpcTryExcept
@ -714,9 +717,12 @@ CreateServiceW(SC_HANDLE hSCManager,
dwDependenciesLength *= sizeof(WCHAR);
}
/* FIXME: Encrypt the password */
lpEncryptedPassword = (LPBYTE)lpPassword;
dwPasswordLength = (DWORD)(lpPassword ? (wcslen(lpPassword) + 1) * sizeof(WCHAR) : 0);
if (lpPassword != NULL)
{
/* FIXME: Encrypt the password */
lpEncryptedPassword = (LPBYTE)lpPassword;
dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR);
}
RpcTryExcept
{