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

[SERVICES]

Browse source 
- Fix dwServiceType and dwServiceState checks in REnumServicesStatusW (see r54373)
- Fix a memory leak in RQueryServiceConfig2A

svn path=/trunk/; revision=54481
This commit is contained in:
Thomas Faber 2011-11-23 17:13:53 +00:00
parent 60c812a9dc
commit 494f949f52
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/base/system/services/rpcserver.c
View file

@ -2511,13 +2511,16 @@ DWORD REnumServicesStatusW(
*pcbBytesNeeded = 0;
*lpServicesReturned = 0;
if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32))
if ((dwServiceType == 0) ||
((dwServiceType & ~(SERVICE_DRIVER | SERVICE_WIN32)) != 0))
{
DPRINT("Not a valid Service Type!\n");
return ERROR_INVALID_PARAMETER;
}
if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL))
if ((dwServiceState != SERVICE_ACTIVE) &&
(dwServiceState != SERVICE_INACTIVE) &&
(dwServiceState != SERVICE_STATE_ALL))
{
DPRINT("Not a valid Service State!\n");
return ERROR_INVALID_PARAMETER;
@ -2667,7 +2670,7 @@ DWORD REnumServicesStatusW(
dwRequiredSize += dwSize;
}
if (dwError == 0)
if (dwError == ERROR_SUCCESS)
{
*pcbBytesNeeded = 0;
if (lpResumeHandle) *lpResumeHandle = 0;
@ -4800,7 +4803,6 @@ DWORD RQueryServiceConfig2A(
PSERVICE lpService = NULL;
HKEY hServiceKey = NULL;
LPWSTR lpDescriptionW = NULL;
LPSTR lpDescription = NULL;
DPRINT("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n",
hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
@ -4894,8 +4896,8 @@ done:
/* Unlock the service database */
ScmUnlockDatabase();
if (lpDescription != NULL)
HeapFree(GetProcessHeap(), 0, lpDescription);
if (lpDescriptionW != NULL)
HeapFree(GetProcessHeap(), 0, lpDescriptionW);
if (hServiceKey != NULL)
RegCloseKey(hServiceKey);