[ros-diffs] [reactos] 01/01: [SAMLIB] SamConnect: Pass a zero-terminated server name to SamrConnect

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b6e8af1bd7ff203411d3…

commit 5b6e8af1bd7ff203411d37cb8c5eccbf92c750d3
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sat Jun 19 20:28:54 2021 +0200
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sat Jun 19 20:29:24 2021 +0200

    [SAMLIB] SamConnect: Pass a zero-terminated server name to SamrConnect
---
 dll/win32/samlib/samlib.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dll/win32/samlib/samlib.c b/dll/win32/samlib/samlib.c
index 5c9b1da2284..d5414d664b5 100644
--- a/dll/win32/samlib/samlib.c
+++ b/dll/win32/samlib/samlib.c
@@ -75,7 +75,7 @@ PSAMPR_SERVER_NAME_bind(PSAMPR_SERVER_NAME pszSystemName)
     LPWSTR pszStringBinding;
     RPC_STATUS status;
 
-    TRACE("PSAMPR_SERVER_NAME_bind() called\n");
+    TRACE("PSAMPR_SERVER_NAME_bind(%S)\n", pszSystemName);
 
     status = RpcStringBindingComposeW(NULL,
                                       L"ncacn_np",
@@ -113,7 +113,7 @@ PSAMPR_SERVER_NAME_unbind(PSAMPR_SERVER_NAME pszSystemName,
 {
     RPC_STATUS status;
 
-    TRACE("PSAMPR_SERVER_NAME_unbind() called\n");
+    TRACE("PSAMPR_SERVER_NAME_unbind(%S)\n", pszSystemName);
 
     status = RpcBindingFree(&hBinding);
     if (status)
@@ -500,14 +500,26 @@ SamConnect(IN OUT PUNICODE_STRING ServerName OPTIONAL,
            IN ACCESS_MASK DesiredAccess,
            IN POBJECT_ATTRIBUTES ObjectAttributes)
 {
+    PSAMPR_SERVER_NAME pServerName = NULL;
     NTSTATUS Status;
 
     TRACE("SamConnect(%p %p 0x%08x %p)\n",
           ServerName, ServerHandle, DesiredAccess, ObjectAttributes);
 
+    if (ServerName != NULL && ServerName->Length > 0 &&
ServerName->Buffer != NULL)
+    {
+        /* Create a zero-terminated server name */
+        pServerName = midl_user_allocate(ServerName->Length + sizeof(WCHAR));
+        if (pServerName == NULL)
+            return STATUS_INSUFFICIENT_RESOURCES;
+
+        CopyMemory(pServerName, ServerName->Buffer, ServerName->Length);
+        pServerName[ServerName->Length / sizeof(WCHAR)] = UNICODE_NULL;
+    }
+
     RpcTryExcept
     {
-        Status = SamrConnect((PSAMPR_SERVER_NAME)ServerName,
+        Status = SamrConnect(pServerName,
                              (SAMPR_HANDLE *)ServerHandle,
                              DesiredAccess);
     }
@@ -517,6 +529,9 @@ SamConnect(IN OUT PUNICODE_STRING ServerName OPTIONAL,
     }
     RpcEndExcept;
 
+    if (pServerName)
+        midl_user_free(pServerName);
+
     return Status;
 }