From 1ef04bbe0a15a8864a383a1b4b2812b69a9ed73e Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 16 Jul 2016 16:18:17 +0000 Subject: [PATCH] [ADVAPI32] 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 --- reactos/dll/win32/advapi32/service/scm.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c index 198eb9885bd..1449e4ebfe6 100644 --- a/reactos/dll/win32/advapi32/service/scm.c +++ b/reactos/dll/win32/advapi32/service/scm.c @@ -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 { -- 2.17.1