Security-59306.101.1.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecBase.cpp b/OSX/libsecurity_keychain/lib/SecBase.cpp
index cb7d01529555efbdfdbd9c1d2984794502b6abad..2d82dd36097a336da1627b390fedb88e52eb1d73 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecBase.cpp
+++ b/OSX/libsecurity_keychain/lib/SecBase.cpp
@@ -25,7 +25,9 @@
 #include <Security/SecBasePriv.h>
 #include <Security/SecKeychainPriv.h>
 #include <security_utilities/threading.h>
+#include <utilities/SecCFRelease.h>
 #include "SecBridge.h"
+#include <Security/SecFramework.h>
 
 static CFStringRef copyErrorMessageFromBundle(OSStatus status,CFStringRef tableName);
 
@@ -97,7 +99,8 @@ cssmErrorString(CSSM_RETURN error)
                        CFStringRef result = copyErrorMessageFromBundle(error,CFSTR("SecErrorMessages"));
                        if (result == NULL)
                                result = copyErrorMessageFromBundle(error,CFSTR("SecDebugErrorMessages"));
-                       err = cfString(result, true);
+                       err = cfString(result, errSecErrorStringNotAvailable);
+            CFReleaseSafe(result);
                }
                
                if (err.empty())
@@ -297,7 +300,7 @@ OSStatus SecKeychainErrFromOSStatus(OSStatus osStatus)
                case CSSMERR_DL_DATASTORE_ALREADY_EXISTS:
                        return errSecDuplicateKeychain;
                case CSSMERR_APPLEDL_DISK_FULL:
-                       return errSecDskFull;
+                       return errSecDiskFull;
                case CSSMERR_DL_INVALID_OPEN_PARAMETERS: 
                case CSSMERR_APPLEDL_INVALID_OPEN_PARAMETERS:
                case CSSMERR_APPLE_DOTMAC_REQ_SERVER_PARAM: