diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 49d56d11cd1..2ec6d8ecdf5 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -565,6 +565,12 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) return FALSE; } while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); for (i = 0; i < nb_services; i++) @@ -610,6 +616,12 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) return FALSE; } while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); for (i = 0; i < nb_services; i++)