Revert "advapi32: Free descriptor if it isn't returned from GetSecurityInfo().".

This reverts commit dbd76575. According to MSDN, ppSecurityDescriptor must not be NULL if any of the SID or ACL parameters are non-NULL. This is wrong, and native GetSecurityInfo will happily return those pointers, leaving one unable to free the original security descriptor.

Revert "advapi32: Free descriptor if it isn't returned from GetSecurityInfo().".
72158ac2 · James Hawkins · Alexandre Julliard · 539da1b0 · 72158ac2
Commit 72158ac2 authored Jan 14, 2010 by James Hawkins Committed by Alexandre Julliard Jan 18, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

security.c dlls/advapi32/security.c +5 -2

No files found.
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -3118,8 +3118,11 @@ DWORD WINAPI GetSecurityInfo(
    }
    if (ppSecurityDescriptor)
        *ppSecurityDescriptor = sd;
-    else
-        LocalFree(sd);
+
+    /* The security descriptor (sd) cannot be freed if ppSecurityDescriptor is
+     * NULL, because native happily returns the SIDs and ACLs that are requested
+     * in this case.
+     */

    return ERROR_SUCCESS;
 }