Security-59754.60.13.tar.gz

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

diff --git a/OSX/libsecurity_transform/lib/SecCustomTransform.cpp b/OSX/libsecurity_transform/lib/SecCustomTransform.cpp
index 9653f90184e0e8b593cbc4dcc1faf7962c0cbf03..4d29a3d0ca25ea078e9dba31c0136c015ba87cf9 100644 (file)
--- a/OSX/libsecurity_transform/lib/SecCustomTransform.cpp
+++ b/OSX/libsecurity_transform/lib/SecCustomTransform.cpp
@@ -32,7 +32,7 @@
 #include "Utilities.h"
 #include "misc.h"
 
 #include "Utilities.h"
 #include "misc.h"
 

-static const CFStringRef kSecCustom = CFSTR("CustomTransform");
+const CFStringRef kSecCustom = CFSTR("CustomTransform");

 const CFStringRef kSecTransformPreviousErrorKey = CFSTR("PreviousError");
 const CFStringRef kSecTransformAbortOriginatorKey = CFSTR("Originating Transform");
 const CFStringRef kSecTransformActionCanExecute = CFSTR("CanExecute");
 const CFStringRef kSecTransformPreviousErrorKey = CFSTR("PreviousError");
 const CFStringRef kSecTransformAbortOriginatorKey = CFSTR("Originating Transform");
 const CFStringRef kSecTransformActionCanExecute = CFSTR("CanExecute");


@@ -303,14 +303,14 @@ public:
 };
 
 
 };
 
 

-static SecTransformActionBlock default_can_run = ^{ return (CFTypeRef)NULL; };
-static SecTransformActionBlock default_execute_starting = default_can_run;
-static SecTransformActionBlock default_finalize = default_execute_starting;
-static SecTransformActionBlock default_externalize_data = default_finalize;
+static const SecTransformActionBlock default_can_run = ^{ return (CFTypeRef)NULL; };
+static const SecTransformActionBlock default_execute_starting = default_can_run;
+static const SecTransformActionBlock default_finalize = default_execute_starting;
+static const SecTransformActionBlock default_externalize_data = default_finalize;

 
 

-static SecTransformDataBlock default_process_data = ^(CFTypeRef value) { return value; };
+static const SecTransformDataBlock default_process_data = ^(CFTypeRef value) { return value; };

 //static SecTransformDataBlock default_validate = ^(CFTypeRef value) { return (CFTypeRef)NULL; };
 //static SecTransformDataBlock default_validate = ^(CFTypeRef value) { return (CFTypeRef)NULL; };

-static SecTransformAttributeActionBlock default_generic_attribute_set_notification = 
+static const SecTransformAttributeActionBlock default_generic_attribute_set_notification =

        ^(SecTransformAttributeRef ah, CFTypeRef value) { return value; };
 
 static SecTransformAttributeActionBlock default_generic_attribute_validation = 
        ^(SecTransformAttributeRef ah, CFTypeRef value) { return value; };
 
 static SecTransformAttributeActionBlock default_generic_attribute_validation = 


@@ -567,12 +567,15 @@ CustomTransformFactory::CustomTransformFactory(CFStringRef uniqueName, SecTransf
     RegisterTransform(this, kSecCustom);
 }
 
     RegisterTransform(this, kSecCustom);
 }
 

-CFTypeRef CustomTransformFactory::Make() 
+// clang cannot possibly reason about the way in which we turn Transforms into CFRefs, and it just looks like a leak
+#ifndef __clang_analyzer__
+CFTypeRef CustomTransformFactory::Make() CF_RETURNS_RETAINED

 {
        CustomTransform *ct = new CustomTransform(this->GetTypename(), createFuncPtr);
        ct->Create();
        return ct->get_ref();
 }
 {
        CustomTransform *ct = new CustomTransform(this->GetTypename(), createFuncPtr);
        ct->Create();
        return ct->get_ref();
 }

+#endif

 
 #pragma mark MISC
 
 
 #pragma mark MISC
 


@@ -590,12 +593,12 @@ extern "C" {
                                                                                                                          null_allowed ? CFSTR(" either") : CFSTR(""),
                                                                                                                          expected_type_name,
                                                                                                                          null_allowed ? CFSTR(" or a NULL") : CFSTR(""));
                                                                                                                          null_allowed ? CFSTR(" either") : CFSTR(""),
                                                                                                                          expected_type_name,
                                                                                                                          null_allowed ? CFSTR(" or a NULL") : CFSTR(""));

-                               CFRelease(value_type_name);
+                               CFReleaseNull(value_type_name);

                        } else {
                                error = CreateSecTransformErrorRef(kSecTransformErrorInvalidType, "%@ received NULL value, expected a %@",
                                                                                                   attr, expected_type_name);
                        }
                        } else {
                                error = CreateSecTransformErrorRef(kSecTransformErrorInvalidType, "%@ received NULL value, expected a %@",
                                                                                                   attr, expected_type_name);
                        }

-                       CFRelease(expected_type_name);
+                       CFReleaseNull(expected_type_name);

                        
                        return error;
                };
                        
                        return error;
                };


@@ -621,6 +624,8 @@ extern "C" {
        }
 }
 
        }
 }
 

+// clang cannot reason about this business of creating an object for the side-effects of doing so
+#ifndef __clang_analyzer__

 Boolean SecTransformRegister(CFStringRef uniqueName, SecTransformCreateFP createFP, CFErrorRef *caller_error) 
 {
        CFErrorRef error = NULL;
 Boolean SecTransformRegister(CFStringRef uniqueName, SecTransformCreateFP createFP, CFErrorRef *caller_error) 
 {
        CFErrorRef error = NULL;


@@ -640,6 +645,7 @@ Boolean SecTransformRegister(CFStringRef uniqueName, SecTransformCreateFP create
                return TRUE;
        }
 }
                return TRUE;
        }
 }

+#endif

 
 SecTransformRef SecTransformCreate(CFStringRef name, CFErrorRef *error) 
 {
 
 SecTransformRef SecTransformCreate(CFStringRef name, CFErrorRef *error) 
 {


@@ -750,12 +756,15 @@ void CustomTransform::AttributeChanged(SecTransformAttributeRef ah, CFTypeRef va
        if (vr) {
                        if (CFGetTypeID(vr) == CFErrorGetTypeID()) {
                                        SendAttribute(AbortAH, vr);
        if (vr) {
                        if (CFGetTypeID(vr) == CFErrorGetTypeID()) {
                                        SendAttribute(AbortAH, vr);

-                                       CFRelease(vr);
+                                       CFReleaseNull(vr);

                        } else {
                        } else {

-                                       CFErrorRef e = CreateSecTransformErrorRef(kSecTransformErrorInvalidType, "Invalid return type from a validate action, expected a CFErrorRef got a %@ (%@)", CFCopyTypeIDDescription(CFGetTypeID(vr)), vr);
+                    CFStringRef idDescription = CFCopyTypeIDDescription(CFGetTypeID(vr));
+                                       CFErrorRef e = CreateSecTransformErrorRef(kSecTransformErrorInvalidType, "Invalid return type from a validate action, expected a CFErrorRef got a %@ (%@)", idDescription, vr);

                                        SendAttribute(AbortAH, e);
                                        SendAttribute(AbortAH, e);

-                                       CFRelease(vr);
-                                       // XXX: this causes a core dump -- I think AbortAH doesn't take it's own reference!!   CFRelease(e);
+                                       CFReleaseNull(vr);
+                    CFReleaseNull(e);
+                    CFReleaseNull(idDescription);
+                                       // XXX: this causes a core dump -- I think AbortAH doesn't take it's own reference!!   CFReleaseNull(e);

                        }
                        return;
        }
                        }
                        return;
        }


@@ -779,7 +788,7 @@ void CustomTransform::AttributeChanged(SecTransformAttributeRef ah, CFTypeRef va
 
                 if (output != value && output != NULL)
                 {
 
                 if (output != value && output != NULL)
                 {

-                    CFRelease(output);
+                    CFReleaseNull(output);

                 }
                        }
                } 
                 }
                        }
                } 


@@ -838,7 +847,7 @@ CFTypeRef CustomTransform::rebind_data_action(CFStringRef action,
         char *utf8_message = utf8(msg);
         syslog(LOG_ERR, "%s", utf8_message);
         free(utf8_message);
         char *utf8_message = utf8(msg);
         syslog(LOG_ERR, "%s", utf8_message);
         free(utf8_message);

-        CFRelease(msg);
+        CFReleaseNull(msg);

        }
        return result;
 }
        }
        return result;
 }


@@ -1022,7 +1031,7 @@ CFDictionaryRef CustomTransform::GetCustomExternalData()
        if (CFGetTypeID(result) == CFErrorGetTypeID())
        {
                // Ouch!  we should deal with this
        if (CFGetTypeID(result) == CFErrorGetTypeID())
        {
                // Ouch!  we should deal with this

-               CFRelease(result);
+               CFReleaseNull(result);

                return NULL;
        }
        
                return NULL;
        }
        


@@ -1031,7 +1040,7 @@ CFDictionaryRef CustomTransform::GetCustomExternalData()
                return (CFDictionaryRef)result;
        }
        
                return (CFDictionaryRef)result;
        }
        

-       CFRelease(result);
+       CFReleaseNull(result);

        result = NULL;
        return (CFDictionaryRef)result;
 }
        result = NULL;
        return (CFDictionaryRef)result;
 }


@@ -1053,9 +1062,9 @@ CFErrorRef SecTransformSetAttributeAction(SecTransformImplementationRef ref,
 {
        if (NULL == ref)
        {
 {
        if (NULL == ref)
        {

-                CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
+        CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput,

                        "SecTransformSetAttributeNotificationAction called with a NULL SecTransformImplementationRef ref");
                        "SecTransformSetAttributeNotificationAction called with a NULL SecTransformImplementationRef ref");

-                       
+        CFAutorelease(result);

                return result;
        }
        
                return result;
        }
        


@@ -1068,9 +1077,9 @@ CFErrorRef SecTransformSetDataAction(SecTransformImplementationRef ref,
 {
        if (NULL == ref)
        {
 {
        if (NULL == ref)
        {

-                CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
+        CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput,

                        "SecTransformSetAttributeNotificationAction called with a NULL SecTransformImplementationRef ref");
                        "SecTransformSetAttributeNotificationAction called with a NULL SecTransformImplementationRef ref");

-                       
+        CFAutorelease(result);

                return result;
        }
        
                return result;
        }
        


@@ -1083,9 +1092,9 @@ CFErrorRef SecTransformSetTransformAction(SecTransformImplementationRef ref,
 {
        if (NULL == ref)
        {
 {
        if (NULL == ref)
        {

-                CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
+        CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput,

                        "SecTransformSetAttributeNotificationAction called with a NULL SecTransformImplementationRef ref");
                        "SecTransformSetAttributeNotificationAction called with a NULL SecTransformImplementationRef ref");

-                       
+        CFAutorelease(result);

                return result;
        }
        
                return result;
        }
        


@@ -1100,7 +1109,7 @@ CFTypeRef SecTranformCustomGetAttribute(SecTransformImplementationRef ref,
        {
         CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
                                                        "SecTransformCustomGetAttribute called with a NULL SecTransformImplementationRef ref");
        {
         CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
                                                        "SecTransformCustomGetAttribute called with a NULL SecTransformImplementationRef ref");

-        
+        CFAutorelease(result);

                return result;
        }
        
                return result;
        }
        


@@ -1114,9 +1123,9 @@ CFTypeRef SecTransformCustomSetAttribute(SecTransformImplementationRef ref,
 {
        if (NULL == ref)
        {
 {
        if (NULL == ref)
        {

-                CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
+        CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput,

                        "SecTransformCustomSetAttribute called with a NULL SecTransformImplementationRef ref");
                        "SecTransformCustomSetAttribute called with a NULL SecTransformImplementationRef ref");

-                       
+        CFAutorelease(result);

                return result;
        }
        
                return result;
        }
        


@@ -1130,9 +1139,9 @@ CFTypeRef SecTransformPushbackAttribute(SecTransformImplementationRef ref,
 {
        if (NULL == ref)
        {
 {
        if (NULL == ref)
        {

-                CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput, 
+        CFErrorRef result = CreateSecTransformErrorRef(kSecTransformErrorInvalidInput,

                        "SecTransformPushbackAttribute called with a NULL SecTransformImplementationRef ref");
                        "SecTransformPushbackAttribute called with a NULL SecTransformImplementationRef ref");

-                       
+        CFAutorelease(result);

                return (CFTypeRef)result;
        }
        
                return (CFTypeRef)result;
        }