Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SERVICES]

Browse source 
- Use FIELD_OFFSET for variable-length structure sizes
- Handle an invalid parameter condition in RCreateServiceW. Fixes an advapi32:service test
- Do not dereference a NULL-pointer on out-of-memory

svn path=/trunk/; revision=54315
This commit is contained in:
Thomas Faber 2011-11-06 14:23:39 +00:00
parent ac825c5ef6
commit 0b595ead09
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,7 @@ ScmCreateOrReferenceServiceImage(PSERVICE pService)
/* Create a new service image */ /* Create a new service image */
pServiceImage = HeapAlloc(GetProcessHeap(), pServiceImage = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SERVICE_IMAGE) + ((wcslen(ImagePath.Buffer) + 1) * sizeof(WCHAR))); FIELD_OFFSET(SERVICE_IMAGE, szImagePath[wcslen(ImagePath.Buffer) + 1]));
if (pServiceImage == NULL) if (pServiceImage == NULL)
{ {
dwError = ERROR_NOT_ENOUGH_MEMORY; dwError = ERROR_NOT_ENOUGH_MEMORY;
@ -368,7 +368,7 @@ ScmCreateNewServiceRecord(LPCWSTR lpServiceName,
/* Allocate service entry */ /* Allocate service entry */
lpService = HeapAlloc(GetProcessHeap(), lpService = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR))); FIELD_OFFSET(SERVICE, szServiceName[wcslen(lpServiceName) + 1]));
if (lpService == NULL) if (lpService == NULL)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;

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

@ -155,7 +155,7 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
Ptr = HeapAlloc(GetProcessHeap(), Ptr = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(MANAGER_HANDLE) + (wcslen(lpDatabaseName) + 1) * sizeof(WCHAR)); FIELD_OFFSET(MANAGER_HANDLE, DatabaseName[wcslen(lpDatabaseName) + 1]));
if (Ptr == NULL) if (Ptr == NULL)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
@ -1999,6 +1999,12 @@ DWORD RCreateServiceW(
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
} }
if ((dwServiceType & SERVICE_KERNEL_DRIVER) &&
(dwServiceType & SERVICE_FILE_SYSTEM_DRIVER))
{
return ERROR_INVALID_PARAMETER;
}
if ((dwServiceType == (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) && if ((dwServiceType == (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) &&
(lpServiceStartName)) (lpServiceStartName))
{ {
@ -2267,9 +2273,12 @@ done:;
} }
else else
{ {
/* Release the display name buffer */ if (lpService != NULL &&
if (lpService->lpServiceName != NULL) lpService->lpServiceName != NULL)
{
/* Release the display name buffer */
HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName); HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName);
}
if (hServiceHandle) if (hServiceHandle)
{ {
@ -2366,7 +2375,7 @@ DWORD REnumDependentServicesW(
(dwServicesReturned + 1) * sizeof(PSERVICE)); (dwServicesReturned + 1) * sizeof(PSERVICE));
if (!lpServicesArray) if (!lpServicesArray)
{ {
DPRINT("Could not allocate a buffer!!\n"); DPRINT1("Could not allocate a buffer!!\n");
dwError = ERROR_NOT_ENOUGH_MEMORY; dwError = ERROR_NOT_ENOUGH_MEMORY;
goto Done; goto Done;
} }
@ -4550,8 +4559,8 @@ DWORD RChangeServiceConfig2A(
dwLength = (strlen(Info.lpDescription) + 1) * sizeof(WCHAR); dwLength = (strlen(Info.lpDescription) + 1) * sizeof(WCHAR);
lpServiceDescriptonW = HeapAlloc(GetProcessHeap(), lpServiceDescriptonW = HeapAlloc(GetProcessHeap(),
0, 0,
dwLength + sizeof(SERVICE_DESCRIPTIONW)); dwLength + sizeof(SERVICE_DESCRIPTIONW));
if (!lpServiceDescriptonW) if (!lpServiceDescriptonW)
{ {
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;