Security-57740.51.3.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecAccess.cpp

diff --git a/OSX/libsecurity_keychain/lib/SecAccess.cpp b/OSX/libsecurity_keychain/lib/SecAccess.cpp
index 39a8b120a091a8210f33d96a56c8683ba21fb8da..4dacfa95bb05a227ba703491dbb5a75ca649b8fe 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecAccess.cpp
+++ b/OSX/libsecurity_keychain/lib/SecAccess.cpp
@@ -27,10 +27,11 @@
 #include <Security/SecTrustedApplication.h>
 #include <Security/SecTrustedApplicationPriv.h>
 #include <security_keychain/Access.h>
+#include <security_utilities/casts.h>
+#include <utilities/SecCFRelease.h>
 #include "SecBridge.h"
 #include <sys/param.h>
 
-#undef secdebug
 #include <utilities/SecCFWrappers.h>
 
 
@@ -231,6 +232,7 @@ CFStringRef GetAuthStringFromACLAuthorizationTag(sint32 tag)
        {
                result = (CFStringRef)CFDictionaryGetValue(gTagMapping, aNum);
        }
+    CFReleaseSafe(aNum);
        return result;
 }
 
@@ -292,7 +294,7 @@ SecAccessRef SecAccessCreateWithOwnerAndACL(uid_t userId, gid_t groupId, SecAcce
        CSSM_ACL_PROCESS_SUBJECT_SELECTOR selector =
        {
                CSSM_ACL_PROCESS_SELECTOR_CURRENT_VERSION,      // selector version
-               ownerType,
+               int_cast<UInt32, uint16>(ownerType),
                userId,
                groupId
        };