[ros-diffs] [ekohl] 58093: [SAMLIB] Ensure that optional parameters are handled properly.

Author: ekohl
Date: Tue Jan  1 21:12:38 2013
New Revision: 58093

URL: http://svn.reactos.org/svn/reactos?rev=58093&view=rev
Log:
[SAMLIB]
Ensure that optional parameters are handled properly.

Modified:
    trunk/reactos/dll/win32/samlib/samlib.c
    trunk/reactos/include/ddk/ntsam.h

Modified: trunk/reactos/dll/win32/samlib/samlib.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?r...
==============================================================================
--- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Tue Jan  1 21:12:38 2013
@@ -212,7 +212,7 @@

NTSTATUS
 NTAPI
-SamConnect(IN OUT PUNICODE_STRING ServerName,
+SamConnect(IN OUT PUNICODE_STRING ServerName OPTIONAL,
            OUT PSAM_HANDLE ServerHandle,
            IN ACCESS_MASK DesiredAccess,
            IN POBJECT_ATTRIBUTES ObjectAttributes)
@@ -682,7 +682,7 @@
     SAMPR_ULONG_ARRAY Membership;
     NTSTATUS Status;

-    TRACE("SamAliasMembership(%p %ul %p %p %p)\n",
+    TRACE("SamAliasMembership(%p %lu %p %p %p)\n",
           DomainHandle, PassedCount, Sids, MembershipCount, Aliases);

if (Sids == NULL ||
@@ -905,7 +905,7 @@
                      IN ULONG Count,
                      IN PULONG RelativeIds,
                      OUT PUNICODE_STRING *Names,
-                     OUT PSID_NAME_USE *Use)
+                     OUT PSID_NAME_USE *Use OPTIONAL)
 {
     SAMPR_RETURNED_USTRING_ARRAY NamesBuffer = {0, NULL};
     SAMPR_ULONG_ARRAY UseBuffer = {0, NULL};
@@ -916,7 +916,9 @@
           DomainHandle, Count, RelativeIds, Names, Use);

*Names = NULL;
-    *Use = NULL;
+
+    if (Use != NULL)
+        *Use = NULL;

RpcTryExcept
     {
@@ -951,13 +953,6 @@
             }
         }

-        *Use = midl_user_allocate(Count * sizeof(SID_NAME_USE));
-        if (*Use == NULL)
-        {
-            Status = STATUS_INSUFFICIENT_RESOURCES;
-            goto done;
-        }
-
         for (i = 0; i < Count; i++)
         {
             (*Names)[i].Length = NamesBuffer.Element[i].Length;
@@ -968,9 +963,19 @@
                           NamesBuffer.Element[i].Length);
         }

-        RtlCopyMemory(*Use,
-                      UseBuffer.Element,
-                      Count * sizeof(SID_NAME_USE));
+        if (Use != NULL)
+        {
+            *Use = midl_user_allocate(Count * sizeof(SID_NAME_USE));
+            if (*Use == NULL)
+            {
+                Status = STATUS_INSUFFICIENT_RESOURCES;
+                goto done;
+            }
+
+            RtlCopyMemory(*Use,
+                          UseBuffer.Element,
+                          Count * sizeof(SID_NAME_USE));
+        }
     }

done:
@@ -987,7 +992,7 @@
             midl_user_free(*Names);
         }

-        if (*Use != NULL)
+        if (Use != NULL && *Use != NULL)
             midl_user_free(*Use);
     }

Modified: trunk/reactos/include/ddk/ntsam.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=580...
==============================================================================
--- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Tue Jan  1 21:12:38 2013
@@ -623,7 +623,7 @@

NTSTATUS
 NTAPI
-SamConnect(IN OUT PUNICODE_STRING ServerName,
+SamConnect(IN OUT PUNICODE_STRING ServerName OPTIONAL,
            OUT PSAM_HANDLE ServerHandle,
            IN ACCESS_MASK DesiredAccess,
            IN POBJECT_ATTRIBUTES ObjectAttributes);
@@ -755,7 +755,7 @@
                      IN ULONG Count,
                      IN PULONG RelativeIds,
                      OUT PUNICODE_STRING *Names,
-                     OUT PSID_NAME_USE *Use);
+                     OUT PSID_NAME_USE *Use OPTIONAL);

NTSTATUS
 NTAPI