advapi32: Validate arguments in StartServiceCtrlDispatcher.

6027fe2d · Piotr Caban · Alexandre Julliard · e17cdb26 · 6027fe2d
Commit 6027fe2d authored Oct 22, 2012 by Piotr Caban Committed by Alexandre Julliard Oct 22, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

service.c dlls/advapi32/service.c +12 -0

No files found.
--- 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++)