ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi: Check if service really exists before bombing out in CreateService.

This commit is contained in:
Maarten Lankhorst 2008-02-21 13:16:25 -08:00 committed by Alexandre Julliard
parent 0b3d880c8e
commit 284f86183c
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/advapi32/service.c
View File

@ -1302,19 +1302,9 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
{ {
HKEY service_key; HKEY service_key;
/* The service already exists, so bail out */ /* Open service first before deciding whether it already exists or not
if(!lstrcmpiW(lpServiceName, buffer)) * It could be that it's not a valid service, but only the registry key itself exists
{
SetLastError(ERROR_SERVICE_EXISTS);
return NULL;
}
/* The given displayname matches the found servicename. We don't bail out
* as servicename is checked before a duplicate displayname
*/ */
if(!lstrcmpiW(lpDisplayName, buffer))
displayname_exists = TRUE;
if (RegOpenKeyExW(hscm->hkey, buffer, 0, KEY_READ, &service_key) == ERROR_SUCCESS) if (RegOpenKeyExW(hscm->hkey, buffer, 0, KEY_READ, &service_key) == ERROR_SUCCESS)
{ {
WCHAR name[MAX_PATH]; WCHAR name[MAX_PATH];
@ -1322,9 +1312,16 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
if (RegQueryValueExW(service_key, szDisplayName, NULL, NULL, (LPBYTE)name, &size) == ERROR_SUCCESS) if (RegQueryValueExW(service_key, szDisplayName, NULL, NULL, (LPBYTE)name, &size) == ERROR_SUCCESS)
{ {
/* The given displayname matches the found displayname */ if (lpDisplayName && (!lstrcmpiW(lpDisplayName, name)
if (!lstrcmpiW(lpDisplayName, name)) || !lstrcmpiW(lpDisplayName, buffer)))
displayname_exists = TRUE; displayname_exists = TRUE;
if (!lstrcmpiW(lpServiceName, buffer))
{
RegCloseKey(service_key);
SetLastError(ERROR_SERVICE_EXISTS);
return NULL;
}
} }
RegCloseKey(service_key); RegCloseKey(service_key);
} }
@ -1332,7 +1329,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
len = sizeof(buffer); len = sizeof(buffer);
} }
if (lpDisplayName && displayname_exists) if (displayname_exists)
{ {
SetLastError(ERROR_DUPLICATE_SERVICE_NAME); SetLastError(ERROR_DUPLICATE_SERVICE_NAME);
return NULL; return NULL;