Fix leaks caused by mismatch of CFRelease/CFRetain with SecItemCopyMa…

…tching
dotnet · Jul 12, 2022 · 07fce44 · 07fce44
1 parent f0845bd
commit 07fce44
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_ios.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_ios.c
@@ -45,12 +45,10 @@ static int32_t EnumerateKeychain(CFStringRef matchType, CFArrayRef* pCertsOut)
         assert(result == NULL);
         status = noErr;
     }
-    else
+
+    if (result != NULL)
     {
-        if (result != NULL)
-        {
-            CFRelease(result);
-        }
+        CFRelease(result);
     }
 
     return status;

diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_macos.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_keychain_macos.c
@@ -262,6 +262,11 @@ static bool IsCertInKeychain(CFTypeRef needle, SecKeychainRef haystack)
     {
         ret = false;
     }
+
+    if (result != NULL)
+    {
+        CFRelease(result);
+    }
 
     CFRelease(itemMatch);
     CFRelease(searchList);