X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/5c19dc3ae3bd8e40a9c028b0deddd50ff337692c..refs/heads/master:/OSX/libsecurity_keychain/lib/SecBase.cpp

diff --git a/OSX/libsecurity_keychain/lib/SecBase.cpp b/OSX/libsecurity_keychain/lib/SecBase.cpp
index cb7d0152..cf69d48a 100644
--- 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())
@@ -138,10 +141,11 @@ copyErrorMessageFromBundle(OSStatus status,CFStringRef tableName)
 	
     // Convert status to Int32 string representation, e.g. "-25924"
     keyString = CFStringCreateWithFormat (kCFAllocatorDefault,NULL,CFSTR("%d"),(int)status);
-    if (!keyString)
+    if (!keyString) {
         goto xit;
+    }
 
-	errorString = CFCopyLocalizedStringFromTableInBundle(keyString,tableName,secBundle,NULL);
+    errorString = CFCopyLocalizedStringFromTableInBundle(keyString,tableName,secBundle,NULL);
     if (CFStringCompare(errorString, keyString, 0)==kCFCompareEqualTo)	// no real error message
 	{
 		if (errorString)
@@ -297,7 +301,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: