Rolf Kalbermatter : advapi32: Return error on NULL service name to GetServiceDisplayNameA/W.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2e67fa32b11e58fdba8f87f24e62b8a72a076a4a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e67fa32b11e58fdba8f87f24e...

Author: Rolf Kalbermatter 
Date:   Sun May 20 22:36:51 2007 +0200

advapi32: Return error on NULL service name to GetServiceDisplayNameA/W.

---

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

diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 23fdd5c..08df41f 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)
     {