From b1f73ba822b5a7bc191f7a659bc2fb3c2006e10d Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 28 Oct 2005 14:31:38 +0000
Subject: [PATCH] fix returning the new token handle in DuplicateTokenEx

svn path=/trunk/; revision=18833
---
 reactos/lib/advapi32/token/token.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/advapi32/token/token.c b/reactos/lib/advapi32/token/token.c
index a18996e3d1c..df55c4d7ae4 100644
--- a/reactos/lib/advapi32/token/token.c
+++ b/reactos/lib/advapi32/token/token.c
@@ -258,7 +258,6 @@ DuplicateTokenEx (IN HANDLE ExistingTokenHandle,
                   OUT PHANDLE DuplicateTokenHandle)
 {
   OBJECT_ATTRIBUTES ObjectAttributes;
-  HANDLE NewToken;
   NTSTATUS Status;
   SECURITY_QUALITY_OF_SERVICE Sqos;
 
@@ -291,7 +290,7 @@ DuplicateTokenEx (IN HANDLE ExistingTokenHandle,
 			     &ObjectAttributes,
 			     FALSE,
 			     TokenType,
-			     &NewToken);
+			     DuplicateTokenHandle);
   if (!NT_SUCCESS(Status))
     {
       SetLastError(RtlNtStatusToDosError(Status));
@@ -344,7 +343,7 @@ CheckTokenMembership(IN HANDLE ExistingTokenHandle,
     };
     PACL Dacl;
     ULONG SidLen;
-    HANDLE hToken;
+    HANDLE hToken = NULL;
     NTSTATUS Status, AccessStatus;
 
     /* doesn't return gracefully if IsMember is NULL! */
@@ -484,7 +483,7 @@ CheckTokenMembership(IN HANDLE ExistingTokenHandle,
     }
 
 Cleanup:
-    if (hToken != ExistingTokenHandle)
+    if (hToken != NULL && hToken != ExistingTokenHandle)
     {
         NtClose(hToken);
     }
-- 
2.17.1