[ADVAPI32] StartServiceCtrlDispatcherA/W(): Check the names of servic…

…es when counting them. Fail also if none were found.
HBelusca · Sep 28, 2024 · 6250558 · 6250558
1 parent d14b6b8
commit 6250558
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c
@@ -1061,14 +1061,23 @@ StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA *lpServiceStartTable)
         return FALSE;
     }
 
+    /* Count the number of active services. They must
+     * have a "valid" name and service procedure. */
     i = 0;
-    while (lpServiceStartTable[i].lpServiceProc != NULL)
+    while (lpServiceStartTable[i].lpServiceName != NULL &&
+           lpServiceStartTable[i].lpServiceProc != NULL)
     {
-        i++;
+        ++i;
     }
-
     dwActiveServiceCount = i;
 
+    /* If no active services were found, fail the call */
+    if (!dwActiveServiceCount)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
     /* Allocate the service table */
     lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(),
                                        HEAP_ZERO_MEMORY,
@@ -1151,14 +1160,23 @@ StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW *lpServiceStartTable)
         return FALSE;
     }
 
+    /* Count the number of active services. They must
+     * have a "valid" name and service procedure. */
     i = 0;
-    while (lpServiceStartTable[i].lpServiceProc != NULL)
+    while (lpServiceStartTable[i].lpServiceName != NULL &&
+           lpServiceStartTable[i].lpServiceProc != NULL)
     {
-        i++;
+        ++i;
     }
-
     dwActiveServiceCount = i;
 
+    /* If no active services were found, fail the call */
+    if (!dwActiveServiceCount)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
     /* Allocate the service table */
     lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(),
                                        HEAP_ZERO_MEMORY,