From 2e67fa32b11e58fdba8f87f24e62b8a72a076a4a Mon Sep 17 00:00:00 2001
From: Rolf Kalbermatter <r.kalbermatter@hccnet.nl>
Date: Sun, 20 May 2007 22:36:51 +0200
Subject: [PATCH] advapi32: Return error on NULL service name to
 GetServiceDisplayNameA/W.

---
 dlls/advapi32/service.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 23fdd5cafe4..08df41fce37 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -2069,6 +2069,12 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
     TRACE("%p %s %p %p\n", hSCManager,
           debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer);
 
+    if (!lpServiceName)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
     hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER);
     if (!hscm)
     {
@@ -2110,6 +2116,12 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
     TRACE("%p %s %p %p\n", hSCManager,
           debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer);
 
+    if (!lpServiceName)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
     hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER);
     if (!hscm)
     {