Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVAPI32] SEH-protext the calls to service control handlers

Browse source 
ScControlService:
- SEH-protext the calls to service control handlers.
- Return ERROR_EXCEPTION_IN_SERVICE if a service control handler throws an exception.
- Return ERROR_SERVICE_CANNOT_ACCEPT_CTRL if no service control handler has been registered for the service.
This commit is contained in:
Eric Kohl 2018-05-02 23:24:26 +02:00
parent 62a90470f8
commit db60cd219c
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dll/win32/advapi32/service/sctrl.c
View file

@ -517,7 +517,7 @@ static DWORD
ScControlService(PACTIVE_SERVICE lpService, ScControlService(PACTIVE_SERVICE lpService,
PSCM_CONTROL_PACKET ControlPacket) PSCM_CONTROL_PACKET ControlPacket)
{ {
DWORD dwError; DWORD dwError = ERROR_SUCCESS;
TRACE("ScControlService(%p %p)\n", TRACE("ScControlService(%p %p)\n",
lpService, ControlPacket); lpService, ControlPacket);
@ -530,16 +530,34 @@ ScControlService(PACTIVE_SERVICE lpService,
if (lpService->HandlerFunction) if (lpService->HandlerFunction)
{ {
(lpService->HandlerFunction)(ControlPacket->dwControl); _SEH2_TRY
dwError = ERROR_SUCCESS; {
(lpService->HandlerFunction)(ControlPacket->dwControl);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
dwError = ERROR_EXCEPTION_IN_SERVICE;
}
_SEH2_END;
} }
else if (lpService->HandlerFunctionEx) else if (lpService->HandlerFunctionEx)
{ {
/* FIXME: Send correct 2nd and 3rd parameters */ _SEH2_TRY
(lpService->HandlerFunctionEx)(ControlPacket->dwControl, {
0, NULL, /* FIXME: Send correct 2nd and 3rd parameters */
lpService->HandlerContext); (lpService->HandlerFunctionEx)(ControlPacket->dwControl,
dwError = ERROR_SUCCESS; 0, NULL,
lpService->HandlerContext);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
dwError = ERROR_EXCEPTION_IN_SERVICE;
}
_SEH2_END;
}
else
{
dwError = ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
} }
TRACE("ScControlService() done (Error %lu)\n", dwError); TRACE("ScControlService() done (Error %lu)\n", dwError);