Skip to content

Release the keychain objects of the certificate lookup on macOS (fix memory leak) #1424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeremyfa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Release the keychain objects of the certificate lookup on macOS (fix memory leak) #1424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/hx/libs/ssl/SSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,13 +557,17 @@ Dynamic _hx_ssl_cert_load_defaults(){
if( SecKeychainOpen("/System/Library/Keychains/SystemRootCertificates.keychain",&keychain) != errSecSuccess )
return null();

// Search for certificates
// Search for certificates. Every CF object created or copied here is
// released: this runs for every TLS connection, and the matching array
// alone holds the whole system root store (hundreds of KB).
Comment on lines +560 to +562

@tobil4sk tobil4sk Oct 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Search for certificates. Every CF object created or copied here is
// released: this runs for every TLS connection, and the matching array
// alone holds the whole system root store (hundreds of KB).
// Search for certificates
// Make sure to release anything we allocate

I think it is self explanatory why we should not leak objects, so a short reminder should be enough

search = CFDictionaryCreateMutable( NULL, 0, NULL, NULL );
CFArrayRef searchList = CFArrayCreate(NULL, (const void **)&keychain, 1, NULL);
CFDictionarySetValue( search, kSecClass, kSecClassCertificate );
CFDictionarySetValue( search, kSecMatchLimit, kSecMatchLimitAll );
CFDictionarySetValue( search, kSecReturnRef, kCFBooleanTrue );
CFDictionarySetValue( search, kSecMatchSearchList, CFArrayCreate(NULL, (const void **)&keychain, 1, NULL) );
if( SecItemCopyMatching( search, (CFTypeRef *)&result ) == errSecSuccess ){
CFDictionarySetValue( search, kSecMatchSearchList, searchList );
result = NULL;

@tobil4sk tobil4sk Oct 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this can be initialised to NULL at the declaration?

if( SecItemCopyMatching( search, (CFTypeRef *)&result ) == errSecSuccess && result ){

@tobil4sk tobil4sk Oct 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any case where it would return errSecSuccess but give a null result?

@jeremyfa jeremyfa Oct 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about that, but I'd say it doesn't harm testing it

CFIndex n = CFArrayGetCount( result );
for( CFIndex i = 0; i < n; i++ ){
item = (SecCertificateRef)CFArrayGetValueAtIndex( result, i );
Expand All @@ -580,6 +584,9 @@ Dynamic _hx_ssl_cert_load_defaults(){
}
}
}
if( result ) CFRelease( result );
CFRelease( search );
CFRelease( searchList );
CFRelease(keychain);
if( chain != NULL )
return chain;
Expand Down
Loading