Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_transform / lib / Utilities.cpp

diff --git a/OSX/libsecurity_transform/lib/Utilities.cpp b/OSX/libsecurity_transform/lib/Utilities.cpp
index 2d396a5644e120d93057121de5a60662b4642778..b3e82e3057dc35862b1c3a2bea82f3f3c428a673 100644 (file)
--- a/OSX/libsecurity_transform/lib/Utilities.cpp
+++ b/OSX/libsecurity_transform/lib/Utilities.cpp
@@ -49,13 +49,13 @@ static CFErrorRef CreateErrorRefCore(CFStringRef domain, int errorCode, const ch
        CFStringRef fmt = CFStringCreateWithCString(NULL, format, kCFStringEncodingUTF8);
        CFStringRef str = CFStringCreateWithFormatAndArguments(NULL, NULL, fmt, ap);
        va_end(ap);
        CFStringRef fmt = CFStringCreateWithCString(NULL, format, kCFStringEncodingUTF8);
        CFStringRef str = CFStringCreateWithFormatAndArguments(NULL, NULL, fmt, ap);
        va_end(ap);

-       CFRelease(fmt);
+       CFReleaseNull(fmt);

        
        CFStringRef keys[] = {kCFErrorDescriptionKey};
        CFStringRef values[] = {str};
        
        CFErrorRef result = CFErrorCreateWithUserInfoKeysAndValues(NULL, domain, errorCode, (const void**) keys, (const void**) values, 1);
        
        CFStringRef keys[] = {kCFErrorDescriptionKey};
        CFStringRef values[] = {str};
        
        CFErrorRef result = CFErrorCreateWithUserInfoKeysAndValues(NULL, domain, errorCode, (const void**) keys, (const void**) values, 1);

-       CFRelease(str);
+       CFReleaseNull(str);

        
        return result;
 }
        
        return result;
 }


@@ -95,7 +95,7 @@ CFTypeRef gAnnotatedRef = NULL;
 
 CFTypeRef DebugRetain(const void* owner, CFTypeRef type)
 {
 
 CFTypeRef DebugRetain(const void* owner, CFTypeRef type)
 {

-       CFTypeRef result = CFRetain(type);
+       CFTypeRef result = CFRetainSafe(type);

        if (type == gAnnotatedRef)
        {
                fprintf(stderr, "Object %p was retained by object %p, count = %ld\n", type, owner, CFGetRetainCount(type));
        if (type == gAnnotatedRef)
        {
                fprintf(stderr, "Object %p was retained by object %p, count = %ld\n", type, owner, CFGetRetainCount(type));


@@ -113,7 +113,7 @@ void DebugRelease(const void* owner, CFTypeRef type)
                fprintf(stderr, "Object %p was released by object %p, count = %ld\n", type, owner, CFGetRetainCount(type) - 1);
        }
        
                fprintf(stderr, "Object %p was released by object %p, count = %ld\n", type, owner, CFGetRetainCount(type) - 1);
        }
        

-       CFRelease(type);
+       CFReleaseNull(type);

 }
 
 // Cribbed from _dispatch_bug and altered a bit
 }
 
 // Cribbed from _dispatch_bug and altered a bit